From 2de5a007d1d5ae35cb8c45cf95de4f1d707854a1 Mon Sep 17 00:00:00 2001
From: oharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>
Date: Tue, 14 Oct 2008 13:14:52 +0000
Subject: Laurentiu Cocanu - more error handling fixes

git-svn-id: svn://svn.berlios.de/openocd/trunk@1059 b42882b7-edfa-0310-969c-e2dbd0fdcd60
---
 src/flash/flash.c | 39 +++++++++++++++++++++++++++++++--------
 1 file changed, 31 insertions(+), 8 deletions(-)

(limited to 'src/flash/flash.c')

diff --git a/src/flash/flash.c b/src/flash/flash.c
index 5f09c72d..d5f89de6 100644
--- a/src/flash/flash.c
+++ b/src/flash/flash.c
@@ -514,7 +514,11 @@ int handle_flash_erase_address_command(struct command_context_s *cmd_ctx, char *
 
 	if ((retval = flash_erase_address_range(target, address, length)) == ERROR_OK)
 	{
-		duration_stop_measure(&duration, &duration_text);
+		if ((retval = duration_stop_measure(&duration, &duration_text)) != ERROR_OK)
+		{
+			free(duration_text);
+			return retval;
+		}
 		command_print(cmd_ctx, "erased address 0x%8.8x length %i in %s", address, length, duration_text);
 		free(duration_text);
 	}
@@ -576,7 +580,11 @@ int handle_flash_erase_command(struct command_context_s *cmd_ctx, char *cmd, cha
 
 		if ((retval = flash_driver_erase(p, first, last)) == ERROR_OK)
 		{
-			duration_stop_measure(&duration, &duration_text);
+			if ((retval = duration_stop_measure(&duration, &duration_text)) != ERROR_OK)
+			{
+				free(duration_text);
+				return retval;
+			}
 
 			command_print(cmd_ctx, "erased sectors %i through %i on flash bank %i in %s", first, last, strtoul(args[0], 0, 0), duration_text);
 			free(duration_text);
@@ -639,7 +647,7 @@ int handle_flash_write_image_command(struct command_context_s *cmd_ctx, char *cm
 	duration_t duration;
 	char *duration_text;
 
-	int retval;
+	int retval, retvaltemp;
 
 	if (argc < 1)
 	{
@@ -697,7 +705,12 @@ int handle_flash_write_image_command(struct command_context_s *cmd_ctx, char *cm
 		return retval;
 	}
 
-	duration_stop_measure(&duration, &duration_text);
+	if ((retvaltemp = duration_stop_measure(&duration, &duration_text)) != ERROR_OK)
+	{
+		free(duration_text);
+		image_close(&image);
+		return retvaltemp;
+	}
 	if (retval == ERROR_OK)
 	{
 		command_print(cmd_ctx, "wrote %u byte from file %s in %s (%f kb/s)",
@@ -713,7 +726,7 @@ int handle_flash_write_image_command(struct command_context_s *cmd_ctx, char *cm
 
 int handle_flash_fill_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
 {
-	int err = ERROR_OK;
+	int err = ERROR_OK, retval;
 	u32 address;
 	u32 pattern;
 	u32 count;
@@ -803,7 +816,12 @@ int handle_flash_fill_command(struct command_context_s *cmd_ctx, char *cmd, char
 		}
 	}
 
-	duration_stop_measure(&duration, &duration_text);
+	if ((retval = duration_stop_measure(&duration, &duration_text)) != ERROR_OK)
+	{
+		free(duration_text);
+		return retval;
+	}
+
 
 	if(err == ERROR_OK)
 	{
@@ -829,7 +847,7 @@ int handle_flash_write_bank_command(struct command_context_s *cmd_ctx, char *cmd
 	duration_t duration;
 	char *duration_text;
 
-	int retval;
+	int retval, retvaltemp;
 	flash_bank_t *p;
 
 	if (argc != 3)
@@ -865,7 +883,12 @@ int handle_flash_write_bank_command(struct command_context_s *cmd_ctx, char *cmd
 	free(buffer);
 	buffer = NULL;
 
-	duration_stop_measure(&duration, &duration_text);
+	if ((retvaltemp = duration_stop_measure(&duration, &duration_text)) != ERROR_OK)
+	{
+		free(duration_text);
+		fileio_close(&fileio);
+		return retvaltemp;
+	}
 	if (retval!=ERROR_OK)
 	{
 	command_print(cmd_ctx, "wrote  %"PRIi64" byte from file %s to flash bank %i at offset 0x%8.8x in %s (%f kb/s)",
-- 
cgit v1.2.3