shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-03-11 20:58:50 +03:00
Code Releases Activity

Replace snprintf with dm_snprintf

Browse Source 
Use dm_snprintf with known error case return code (-1).
This commit is contained in:
Zdenek Kabelac 2010-11-30 22:16:25 +00:00
parent 41cf252f0b
commit a8d4cd68eb
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
WHATS_NEW
View File

@ -1,5 +1,6 @@
Version 2.02.78 - Version 2.02.78 -
==================================== ====================================
Replace snprintf with dm_snprintf in clvmd-command.c.
Check reallocated buffer for NULL before use in clvmd do_command(). Check reallocated buffer for NULL before use in clvmd do_command().
Fix memory leak when VG allocation policy in metadata is invalid. Fix memory leak when VG allocation policy in metadata is invalid.
Ignore unrecognised allocation policy found in metadata instead of aborting. Ignore unrecognised allocation policy found in metadata instead of aborting.

11
daemons/clvmd/clvmd-command.c
View File

@ -97,7 +97,7 @@ int do_command(struct local_client *client, struct clvm_header *msg, int msglen,
} }
if (*buf) { if (*buf) {
uname(&nodeinfo); uname(&nodeinfo);
*retlen = 1 + snprintf(*buf, buflen, *retlen = 1 + dm_snprintf(*buf, buflen,
"TEST from %s: %s v%s", "TEST from %s: %s v%s",
nodeinfo.nodename, args, nodeinfo.nodename, args,
nodeinfo.release); nodeinfo.release);
@ -121,8 +121,7 @@ int do_command(struct local_client *client, struct clvm_header *msg, int msglen,
status = do_lock_lv(lock_cmd, lock_flags, lockname); status = do_lock_lv(lock_cmd, lock_flags, lockname);
/* Replace EIO with something less scary */ /* Replace EIO with something less scary */
if (status == EIO) { if (status == EIO) {
*retlen = *retlen = 1 + dm_snprintf(*buf, buflen, "%s",
1 + snprintf(*buf, buflen, "%s",
get_last_lvm_error()); get_last_lvm_error());
return EIO; return EIO;
} }
@ -133,7 +132,7 @@ int do_command(struct local_client *client, struct clvm_header *msg, int msglen,
if (buflen < 3) if (buflen < 3)
return EIO; return EIO;
if ((locktype = do_lock_query(lockname))) if ((locktype = do_lock_query(lockname)))
*retlen = 1 + snprintf(*buf, buflen, "%s", locktype); *retlen = 1 + dm_snprintf(*buf, buflen, "%s", locktype);
break; break;
case CLVMD_CMD_REFRESH: case CLVMD_CMD_REFRESH:
@ -169,7 +168,7 @@ int do_command(struct local_client *client, struct clvm_header *msg, int msglen,
/* Check the status of the command and return the error text */ /* Check the status of the command and return the error text */
if (status) { if (status) {
*retlen = 1 + (*buf) ? snprintf(*buf, buflen, "%s", *retlen = 1 + (*buf) ? dm_snprintf(*buf, buflen, "%s",
strerror(status)) : -1; strerror(status)) : -1;
} }
@ -377,7 +376,7 @@ static int restart_clvmd(void)
/* Propogate debug options */ /* Propogate debug options */
if (debug) { if (debug) {
if (!(debug_arg = malloc(16)) || if (!(debug_arg = malloc(16)) ||
snprintf(debug_arg, 16, "-d%d", (int)debug) < 0) dm_snprintf(debug_arg, 16, "-d%d", (int)debug) < 0)
goto_out; goto_out;
argv[argc++] = debug_arg; argv[argc++] = debug_arg;
} }