[Openocd-svn] r2232 - trunk/src/target

[<zw...@ma...>]

Author: zwelch
Date: 2009-06-13 02:33:42 +0200 (Sat, 13 Jun 2009)
New Revision: 2232

Modified:
   trunk/src/target/target.c
Log:
Improve handle_load_image_command argument parsing:
- Use parse_u32 to ensure base/min/max addresses parse properly.


Modified: trunk/src/target/target.c
===================================================================
--- trunk/src/target/target.c	2009-06-13 00:33:34 UTC (rev 2231)
+++ trunk/src/target/target.c	2009-06-13 00:33:42 UTC (rev 2232)
@@ -2153,8 +2153,12 @@
 	/* 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 @@
 
 	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)