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

cleanup: previous patch with libdm config node buffer size

Browse Source
This commit is contained in:
Peter Rajnoha 2016-03-04 15:19:09 +01:00
parent 967a0889a0
commit 67c5006e12
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libdm/libdm-config.c
View File

@ -222,7 +222,7 @@ __attribute__ ((format(printf, 2, 3)))
static int _line_append(struct config_output *out, const char *fmt, ...) static int _line_append(struct config_output *out, const char *fmt, ...)
{ {
char buf[4096]; char buf[4096];
char *final_buf; char *dyn_buf = NULL;
va_list ap; va_list ap;
int n; int n;
@ -246,21 +246,23 @@ static int _line_append(struct config_output *out, const char *fmt, ...)
* so try dynamically allocated buffer now... * so try dynamically allocated buffer now...
*/ */
va_start(ap, fmt); va_start(ap, fmt);
n = dm_vasprintf(&final_buf, fmt, ap); n = dm_vasprintf(&dyn_buf, fmt, ap);
va_end(ap); va_end(ap);
if (n < 0) { if (n < 0) {
log_error("dm_vasprintf failed for config line"); log_error("dm_vasprintf failed for config line");
return 0; return 0;
} }
} else }
final_buf = buf;
if (!dm_pool_grow_object(out->mem, final_buf, strlen(final_buf))) { if (!dm_pool_grow_object(out->mem, dyn_buf ? : buf, 0)) {
log_error("dm_pool_grow_object failed for config line"); log_error("dm_pool_grow_object failed for config line");
dm_free(dyn_buf);
return 0; return 0;
} }
dm_free(dyn_buf);
return 1; return 1;
} }