From: David Woodhouse <dwmw2@infradead.org>
Date: Wed, 12 Apr 2006 01:32:47 +0000 (-0500)
Subject: Fix cbuf free properly.
X-Git-Tag: v1.0.0~3
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=77a840b7e2e6a432299ccdb98031db56471d7848;p=mtd-utils.git

Fix cbuf free properly.
Noted by Dan Berrange.

Signed-off-by: Josh Boyer <jwboyer@gmail.com>
---

diff --git a/mkfs.jffs2.c b/mkfs.jffs2.c
index 8d1c7a5..a708f14 100644
--- a/mkfs.jffs2.c
+++ b/mkfs.jffs2.c
@@ -862,12 +862,15 @@ static void write_regular_file(struct filesystem_entry *e)
 			full_write(out_fd, wbuf, space);
 			padword();
 
+            if (tbuf!= cbuf) {
+				free(cbuf);
+				cbuf = NULL;
+			}
+
 			tbuf += dsize;
 			len -= dsize;
 			offset += dsize;
 
-            if (tbuf!= cbuf)
-				free(cbuf);
 		}
 	}
 	if (!je32_to_cpu(ri.version)) {
@@ -1203,7 +1206,7 @@ static char *helptext =
 	"  -V, --version           Display version information\n"
 	"  -i, --incremental=FILE  Parse FILE and generate appendage output for it\n\n";
 
-static char *revtext = "$Revision: 1.49 $";
+static char *revtext = "$Revision: 1.50 $";
 
 int load_next_block() {