diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2006-09-26 22:18:44 +0000 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2006-09-26 22:18:44 +0000 |
| commit | f37507a707e53e51b96723f04c2c026f7dc80ed6 (patch) | |
| tree | 93602bf82f95f87bd9e96a9dab6d76b577d0955c /src | |
| parent | fc6946e96f2ac45a2713a045c3362573efd27263 (diff) | |
| download | xine-lib-f37507a707e53e51b96723f04c2c026f7dc80ed6.tar.gz xine-lib-f37507a707e53e51b96723f04c2c026f7dc80ed6.tar.bz2 | |
Free the _data pointer when returning NULL. Fix backported from upstream.
Closes Coverity Scan CID 225.
CVS patchset: 8309
CVS date: 2006/09/26 22:18:44
Diffstat (limited to 'src')
| -rw-r--r-- | src/input/vcd/libcdio/_cdio_linux.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/input/vcd/libcdio/_cdio_linux.c b/src/input/vcd/libcdio/_cdio_linux.c index 86a34133f..ea70d262c 100644 --- a/src/input/vcd/libcdio/_cdio_linux.c +++ b/src/input/vcd/libcdio/_cdio_linux.c @@ -1,5 +1,5 @@ /* - $Id: _cdio_linux.c,v 1.3 2005/01/01 02:43:57 rockyb Exp $ + $Id: _cdio_linux.c,v 1.4 2006/09/26 22:18:44 dgp85 Exp $ Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org> Copyright (C) 2002, 2003, 2004 Rocky Bernstein <rocky@panix.com> @@ -27,7 +27,7 @@ # include "config.h" #endif -static const char _rcsid[] = "$Id: _cdio_linux.c,v 1.3 2005/01/01 02:43:57 rockyb Exp $"; +static const char _rcsid[] = "$Id: _cdio_linux.c,v 1.4 2006/09/26 22:18:44 dgp85 Exp $"; #include <string.h> @@ -1151,7 +1151,10 @@ cdio_open_am_linux (const char *psz_orig_source, const char *access_mode) if (NULL == psz_orig_source) { psz_source=cdio_get_default_device_linux(); - if (NULL == psz_source) return NULL; + if (NULL == psz_source) { + free(_data); + return NULL; + } set_arg_linux(_data, "source", psz_source); free(psz_source); } else { @@ -1162,6 +1165,7 @@ cdio_open_am_linux (const char *psz_orig_source, const char *access_mode) #if 0 cdio_info ("source %s is not a device", psz_orig_source); #endif + free(_data); return NULL; } } |