diff options
author | oharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2008-05-20 10:10:54 +0000 |
---|---|---|
committer | oharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2008-05-20 10:10:54 +0000 |
commit | 0485363c457fd42f38e94ee6b7190c89a4aa762f (patch) | |
tree | 0816f27dc3751362b13bc08e3c0580173eb1f0cb /src/flash | |
parent | 0989c374e91fb7c743c8f791e55fcca935351e9d (diff) | |
download | openocd+libswd-0485363c457fd42f38e94ee6b7190c89a4aa762f.tar.gz openocd+libswd-0485363c457fd42f38e94ee6b7190c89a4aa762f.tar.bz2 openocd+libswd-0485363c457fd42f38e94ee6b7190c89a4aa762f.tar.xz openocd+libswd-0485363c457fd42f38e94ee6b7190c89a4aa762f.zip |
Edgar Grimberg fixes some memory handling issues and
a problem with arm7_9_debug_entry not executing a code path upon crashes.
git-svn-id: svn://svn.berlios.de/openocd/trunk@669 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src/flash')
-rw-r--r-- | src/flash/flash.c | 3 | ||||
-rw-r--r-- | src/flash/nand.c | 36 |
2 files changed, 28 insertions, 11 deletions
diff --git a/src/flash/flash.c b/src/flash/flash.c index 3478b6a2..3b2abe23 100644 --- a/src/flash/flash.c +++ b/src/flash/flash.c @@ -829,12 +829,15 @@ int handle_flash_write_bank_command(struct command_context_s *cmd_ctx, char *cmd buffer = malloc(fileio.size); if (fileio_read(&fileio, fileio.size, buffer, &buf_cnt) != ERROR_OK) { + free(buffer); + fileio_close(&fileio); return ERROR_OK; } retval = flash_driver_write(p, buffer, offset, buf_cnt); free(buffer); + buffer = NULL; duration_stop_measure(&duration, &duration_text); if (retval!=ERROR_OK) diff --git a/src/flash/nand.c b/src/flash/nand.c index 4d355cf1..5cfc2766 100644 --- a/src/flash/nand.c +++ b/src/flash/nand.c @@ -1292,6 +1292,9 @@ int handle_nand_write_command(struct command_context_s *cmd_ctx, char *cmd, char if (offset % p->page_size) { command_print(cmd_ctx, "only page size aligned offsets and sizes are supported"); + fileio_close(&fileio); + free(oob); + free(page); return ERROR_OK; } @@ -1299,7 +1302,7 @@ int handle_nand_write_command(struct command_context_s *cmd_ctx, char *cmd, char { u32 size_read; - if (page) + if (NULL != page) { fileio_read(&fileio, page_size, page, &size_read); buf_cnt -= size_read; @@ -1309,7 +1312,7 @@ int handle_nand_write_command(struct command_context_s *cmd_ctx, char *cmd, char } } - if (oob) + if (NULL != oob) { fileio_read(&fileio, oob_size, oob, &size_read); buf_cnt -= size_read; @@ -1323,17 +1326,26 @@ int handle_nand_write_command(struct command_context_s *cmd_ctx, char *cmd, char { command_print(cmd_ctx, "failed writing file %s to NAND flash %s at offset 0x%8.8x", args[1], args[0], offset); + + fileio_close(&fileio); + free(oob); + free(page); + return ERROR_OK; } offset += page_size; } fileio_close(&fileio); - + free(oob); + free(page); + oob = NULL; + page = NULL; duration_stop_measure(&duration, &duration_text); command_print(cmd_ctx, "wrote file %s to NAND flash %s at offset 0x%8.8x in %s", args[1], args[0], offset, duration_text); free(duration_text); + duration_text = NULL; } else { @@ -1419,16 +1431,19 @@ int handle_nand_dump_command(struct command_context_s *cmd_ctx, char *cmd, char if ((retval = nand_read_page(p, address / p->page_size, page, page_size, oob, oob_size)) != ERROR_OK) { command_print(cmd_ctx, "reading NAND flash page failed"); + free(page); + free(oob); + fileio_close(&fileio); return ERROR_OK; } - if (page) + if (NULL != page) { fileio_write(&fileio, page_size, page, &size_written); bytes_done += page_size; } - if (oob) + if (NULL != oob) { fileio_write(&fileio, oob_size, oob, &size_written); bytes_done += oob_size; @@ -1438,17 +1453,16 @@ int handle_nand_dump_command(struct command_context_s *cmd_ctx, char *cmd, char address += p->page_size; } - if (page) - free(page); - - if (oob) - free(oob); - + free(page); + page = NULL; + free(oob); + oob = NULL; fileio_close(&fileio); duration_stop_measure(&duration, &duration_text); command_print(cmd_ctx, "dumped %"PRIi64" byte in %s", fileio.size, duration_text); free(duration_text); + duration_text = NULL; } else { |