From bb37adadab7e99ce139179c1cb8322a7e1e921cb Mon Sep 17 00:00:00 2001
From: zwelch <zwelch@b42882b7-edfa-0310-969c-e2dbd0fdcd60>
Date: Sat, 13 Jun 2009 00:33:42 +0000
Subject: [PATCH] Improve handle_load_image_command argument parsing: - Use
parse_u32 to ensure base/min/max addresses parse properly.
git-svn-id: svn://svn.berlios.de/openocd/trunk@2232 b42882b7-edfa-0310-969c-e2dbd0fdcd60
---
src/target/target.c | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/target/target.c b/src/target/target.c
index c2f479add..523b6fa13 100644
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -2153,8 +2153,12 @@ static int handle_load_image_command(struct command_context_s *cmd_ctx, char *cm
/* a base address isn't always necessary, default to 0x0 (i.e. don't relocate) */
if (argc >= 2)
{
+ u32 addr;
+ retval = parse_u32(args[1], &addr);
+ if (ERROR_OK != retval)
+ return ERROR_COMMAND_SYNTAX_ERROR;
+ image.base_address = addr;
image.base_address_set = 1;
- image.base_address = strtoul(args[1], NULL, 0);
}
else
{
@@ -2166,11 +2170,17 @@ static int handle_load_image_command(struct command_context_s *cmd_ctx, char *cm
if (argc>=4)
{
- min_address=strtoul(args[3], NULL, 0);
+ retval = parse_u32(args[3], &min_address);
+ if (ERROR_OK != retval)
+ return ERROR_COMMAND_SYNTAX_ERROR;
}
if (argc>=5)
{
- max_address=strtoul(args[4], NULL, 0)+min_address;
+ retval = parse_u32(args[4], &max_address);
+ if (ERROR_OK != retval)
+ return ERROR_COMMAND_SYNTAX_ERROR;
+ // use size (given) to find max (required)
+ max_address += min_address;
}
if (min_address>max_address)
--
GitLab