From: Øyvind Harboe <oyvind.harboe@zylin.com>
Date: Mon, 27 Sep 2010 14:45:25 +0000 (+0200)
Subject: flash: fix error handling
X-Git-Tag: v0.5.0-rc1~395
X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=commitdiff_plain;h=45e5d1d90acaff8cf57f694e70ec41ece9bddfcd

flash: fix error handling

memory leaks and missing check on memory allocation.

Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
---

diff --git a/src/flash/nor/core.c b/src/flash/nor/core.c
index d200d8c817..2c1d9dee04 100644
--- a/src/flash/nor/core.c
+++ b/src/flash/nor/core.c
@@ -601,7 +601,9 @@ int flash_write_unlock(struct target *target, struct image *image,
 		/* find the corresponding flash bank */
 		retval = get_flash_bank_by_addr(target, run_address, false, &c);
 		if (retval != ERROR_OK)
-			return retval;
+		{
+			goto done;
+		}
 		if (c == NULL)
 		{
 			section++; /* and skip it */
@@ -653,7 +655,8 @@ int flash_write_unlock(struct target *target, struct image *image,
 		if (run_address + run_size - 1 > c->base + c->size - 1)
 		{
 			LOG_ERROR("The image is too big for the flash");
-			return ERROR_FAIL;
+			retval = ERROR_FAIL;
+			goto done;
 		}
 
 		/* If we're applying any sector automagic, then pad this
@@ -679,6 +682,12 @@ int flash_write_unlock(struct target *target, struct image *image,
 
 		/* allocate buffer */
 		buffer = malloc(run_size);
+		if (buffer == NULL)
+		{
+			LOG_ERROR("Out of memory for flash bank buffer");
+			retval = ERROR_FAIL;
+			goto done;
+		}
 		buffer_size = 0;
 
 		/* read sections to the buffer */