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 8d1c7a5b285103bcc3691ad5fde7622e313d97b6..a708f14bf0da987b6ddaa9746ed5d029030058fc 100644 (file)
--- 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() {