libburnia/libburn
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed a theoretical memory leak in actually unused code. Reported by cppcheck.

Browse Source
This commit is contained in:
Thomas Schmitt 2015-11-25 09:34:07 +00:00
parent d428bae0fa
commit f2c2e5e59c
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cdrskin/cdrskin_timestamp.h
View File

@ -1 +1 @@
#define Cdrskin_timestamP "2015.11.02.151241" #define Cdrskin_timestamP "2015.11.25.093414"

17
libburn/sg-freebsd.c
View File

@ -441,6 +441,11 @@ static void enumerate_common(char *fname, int bus_no, int host_no,
struct burn_drive *t; struct burn_drive *t;
struct burn_drive out; struct burn_drive out;
/* Initialize pointers to managed memory */
out.devname = NULL;
out.idata = NULL;
out.mdata = NULL;
/* ts A60923 */ /* ts A60923 */
out.bus_no = bus_no; out.bus_no = bus_no;
out.host = host_no; out.host = host_no;
@ -449,6 +454,8 @@ static void enumerate_common(char *fname, int bus_no, int host_no,
out.lun = lun_no; out.lun = lun_no;
out.devname = strdup(fname); out.devname = strdup(fname);
if (out.devname == NULL)
goto could_not_allocate;
out.cam = NULL; out.cam = NULL;
out.lock_fd = -1; out.lock_fd = -1;
@ -493,9 +500,19 @@ static void enumerate_common(char *fname, int bus_no, int host_no,
out.idata->valid = 0; out.idata->valid = 0;
out.mdata = calloc(1, sizeof(struct scsi_mode_data)); out.mdata = calloc(1, sizeof(struct scsi_mode_data));
if (out.idata == NULL || out.mdata == NULL) { if (out.idata == NULL || out.mdata == NULL) {
could_not_allocate:;
libdax_msgs_submit(libdax_messenger, -1, 0x00020108, libdax_msgs_submit(libdax_messenger, -1, 0x00020108,
LIBDAX_MSGS_SEV_FATAL, LIBDAX_MSGS_PRIO_HIGH, LIBDAX_MSGS_SEV_FATAL, LIBDAX_MSGS_PRIO_HIGH,
"Could not allocate new drive object", 0, 0); "Could not allocate new drive object", 0, 0);
if (out.devname != NULL)
free(out.devname);
out.devname = NULL;
if (out.idata != NULL)
free(out.idata);
out.idata = NULL;
if (out.mdata != NULL)
free(out.mdata);
out.mdata = NULL;
return; return;
} }
out.mdata->p2a_valid = 0; out.mdata->p2a_valid = 0;