shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

Fix a few leaks in reporting error paths.

Browse Source
This commit is contained in:
Alasdair Kergon 2007-02-14 15:12:16 +00:00
parent 2f2c993235
commit 012869d6d2
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
WHATS_NEW_DM
View File

@ -1,5 +1,6 @@
Version 1.02.19 - Version 1.02.19 -
==================================== ====================================
Fix a few leaks in reporting error paths. [1.02.15+]
Version 1.02.18 - 13th February 2007 Version 1.02.18 - 13th February 2007
==================================== ====================================

9
libdm/libdm-report.c
View File

@ -504,15 +504,20 @@ struct dm_report *dm_report_init(uint32_t *report_types,
if (!(rh->mem = dm_pool_create("report", 10 * 1024))) { if (!(rh->mem = dm_pool_create("report", 10 * 1024))) {
log_error("dm_report_init: allocation of memory pool failed"); log_error("dm_report_init: allocation of memory pool failed");
dm_free(rh);
return NULL; return NULL;
} }
/* Generate list of fields for output based on format string & flags */ /* Generate list of fields for output based on format string & flags */
if (!_parse_options(rh, output_fields)) if (!_parse_options(rh, output_fields)) {
dm_report_free(rh);
return NULL; return NULL;
}
if (!_parse_keys(rh, sort_keys)) if (!_parse_keys(rh, sort_keys)) {
dm_report_free(rh);
return NULL; return NULL;
}
/* Return updated types value for further compatility check by caller */ /* Return updated types value for further compatility check by caller */
if (report_types) if (report_types)

3
tools/dmsetup.c
View File

@ -2019,6 +2019,7 @@ static int _process_losetup_switches(const char *base, int *argc, char ***argv)
if (*argc != 2) { if (*argc != 2) {
fprintf(stderr, "%s: Too few arguments\n", base); fprintf(stderr, "%s: Too few arguments\n", base);
_losetup_usage(stderr); _losetup_usage(stderr);
dm_free(device_name);
return 0; return 0;
} }
@ -2027,6 +2028,7 @@ static int _process_losetup_switches(const char *base, int *argc, char ***argv)
fprintf(stderr, "%s: Could not parse loop file name %s\n", fprintf(stderr, "%s: Could not parse loop file name %s\n",
base, (*argv)[1]); base, (*argv)[1]);
_losetup_usage(stderr); _losetup_usage(stderr);
dm_free(device_name);
return 0; return 0;
} }
@ -2034,6 +2036,7 @@ static int _process_losetup_switches(const char *base, int *argc, char ***argv)
_table = dm_malloc(LOOP_TABLE_SIZE); _table = dm_malloc(LOOP_TABLE_SIZE);
if (!_loop_table(_table, LOOP_TABLE_SIZE, loop_file, device_name, offset)) { if (!_loop_table(_table, LOOP_TABLE_SIZE, loop_file, device_name, offset)) {
fprintf(stderr, "Could not build device-mapper table for %s\n", (*argv)[0]); fprintf(stderr, "Could not build device-mapper table for %s\n", (*argv)[0]);
dm_free(device_name);
return 0; return 0;
} }
_switches[TABLE_ARG]++; _switches[TABLE_ARG]++;