shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-02 01:18:26 +03:00
Code Releases Activity

lvmetad: validate dm_asprintf in buffer_append_vf

Browse Source 
Check result of dm_asprintf
Check buffer_append result
Declare vars in front
This commit is contained in:
Zdenek Kabelac 2012-10-12 10:57:01 +02:00
parent 5c792f620b
commit f2a5d3ae3a
1 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
libdaemon/client/config-util.c
View File

@ -23,9 +23,12 @@
int buffer_append_vf(struct buffer *buf, va_list ap)
{
char *append;
char *append = NULL;
char *next;
int keylen;
int64_t value;
char *string;
char *block;
while ((next = va_arg(ap, char *))) {
if (!strchr(next, '=')) {
@ -34,21 +37,25 @@ int buffer_append_vf(struct buffer *buf, va_list ap)
}
keylen = strchr(next, '=') - next;
if (strstr(next, "%d") || strstr(next, "%" PRId64)) {
int64_t value = va_arg(ap, int64_t);
dm_asprintf(&append, "%.*s= %" PRId64 "\n", keylen, next, value);
value = va_arg(ap, int64_t);
if (!dm_asprintf(&append, "%.*s= %" PRId64 "\n", keylen, next, value) < 0)
goto fail;
} else if (strstr(next, "%s")) {
char *value = va_arg(ap, char *);
dm_asprintf(&append, "%.*s= \"%s\"\n", keylen, next, value);
string = va_arg(ap, char *);
if (!dm_asprintf(&append, "%.*s= \"%s\"\n", keylen, next, string) < 0)
goto fail;
} else if (strstr(next, "%b")) {
char *block = va_arg(ap, char *);
if (!block)
if (!(block = va_arg(ap, char *)))
continue;
dm_asprintf(&append, "%.*s%s", keylen, next, block);
} else {
dm_asprintf(&append, "%s", next);
}
if (!append) goto fail;
buffer_append(buf, append);
if (!dm_asprintf(&append, "%.*s%s", keylen, next, block) < 0)
goto fail;
} else if (!dm_asprintf(&append, "%s", next) < 0)
goto fail;
if (!append ||
!buffer_append(buf, append))
return 0;
dm_free(append);
}