[dm-devel] device-mapper ./WHATS_NEW dmsetup/dmsetup.c

[agk at sourceware.org]

CVSROOT:	/cvs/dm
Module name:	device-mapper
Changes by:	agk at sourceware.org	2007-06-19 15:47:21

Modified files:
	.              : WHATS_NEW 
	dmsetup        : dmsetup.c 

Log message:
	Fix dmsetup -o devno string termination. (1.02.20)

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/device-mapper/WHATS_NEW.diff?cvsroot=dm&r1=1.187&r2=1.188
http://sourceware.org/cgi-bin/cvsweb.cgi/device-mapper/dmsetup/dmsetup.c.diff?cvsroot=dm&r1=1.92&r2=1.93

--- device-mapper/WHATS_NEW	2007/06/15 20:49:30	1.187
+++ device-mapper/WHATS_NEW	2007/06/19 15:47:20	1.188
@@ -1,5 +1,6 @@
 Version 1.02.21 -
 ================================
+  Fix dmsetup -o devno string termination. (1.02.20) 
 
 Version 1.02.20 - 15th June 2007
 ================================
--- device-mapper/dmsetup/dmsetup.c	2007/06/15 18:20:28	1.92
+++ device-mapper/dmsetup/dmsetup.c	2007/06/19 15:47:20	1.93
@@ -1629,7 +1629,7 @@
 		goto out_abandon;
 	}
 
-	if (!dm_pool_grow_object(mem, buf, strlen(buf))) {
+	if (!dm_pool_grow_object(mem, buf, strlen(buf) + 1)) {
 		log_error("dm_pool_grow_object failed");
 		goto out_abandon;
 	}
@@ -1662,7 +1662,7 @@
 		name = dm_tree_node_get_name(parent);
 		if (!name || !*name)
 			continue;
-		if (!first_node && !dm_pool_grow_object(mem, ",", 1)) {
+		if (!first_node && !dm_pool_grow_object(mem, ",", 2)) {
 			log_error("dm_pool_grow_object failed");
 			goto out_abandon;
 		}