From: Antonio Borneo <borneo.antonio@gmail.com>
Date: Tue, 12 Oct 2010 08:08:35 +0000 (+0800)
Subject: TARGET: fix segfault in handle_dump_image_command()
X-Git-Tag: v0.5.0-rc1~376
X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=commitdiff_plain;h=2ee47b22c6228b80c5a8f1e74209cbf7ad53f775

TARGET: fix segfault in handle_dump_image_command()

The struct fileio is used after fileio_close().
Move fileio_close() after last usage.

Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
---

diff --git a/src/target/target.c b/src/target/target.c
index 82cbbff547..3c85502e90 100644
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -2643,9 +2643,6 @@ COMMAND_HANDLER(handle_dump_image_command)
 		address += this_run_size;
 	}
 
-	if ((retvaltemp = fileio_close(&fileio)) != ERROR_OK)
-		return retvaltemp;
-
 	if ((ERROR_OK == retval) && (duration_measure(&bench) == ERROR_OK))
 	{
 		int filesize;
@@ -2657,6 +2654,9 @@ COMMAND_HANDLER(handle_dump_image_command)
 				duration_elapsed(&bench), duration_kbps(&bench, filesize));
 	}
 
+	if ((retvaltemp = fileio_close(&fileio)) != ERROR_OK)
+		return retvaltemp;
+
 	return retval;
 }