Updates after feedback #1

livecodepanos · livecodepanos · commit 94520844458a · 2013-09-13T14:36:46.000+01:00
diff --git a/engine/src/uidc.cpp b/engine/src/uidc.cpp
@@ -1200,8 +1200,9 @@ void MCUIDC::siguser()
 Boolean MCUIDC::lookupcolor(MCStringRef s, MCColor *color)
 {
 	uint4 slength = MCStringGetLength(s);
-	char *startptr = new char[slength + 1];
-	char *sptr = startptr;
+	MCAutoPointer<char> startptr;
+    startptr = new char[slength + 1];
+	char *sptr = *startptr;
 	MCU_lower(sptr, MCStringGetOldString(s));
 	sptr[slength] = '\0';
 	if (*sptr == '#')
@@ -1229,10 +1230,7 @@ Boolean MCUIDC::lookupcolor(MCStringRef s, MCColor *color)
 					if (c >= 'a' && c <= 'f')
 						b |= c - ('a' - 10);
 					else
-					{
-						delete startptr;
 						return False;
-					}
 			}
 		}
 		while (*sptr != '\0');
@@ -1256,7 +1254,6 @@ Boolean MCUIDC::lookupcolor(MCStringRef s, MCColor *color)
 			shiftbits -= goodbits;
 		}
 		color->flags = DoRed | DoGreen | DoBlue;
-		delete startptr;
 		return True;
 	}
 	char *tptr = sptr;
@@ -1283,11 +1280,9 @@ Boolean MCUIDC::lookupcolor(MCStringRef s, MCColor *color)
 				color->green = (color_table[mid].green << 8) + color_table[mid].green;
 				color->blue = (color_table[mid].blue << 8) + color_table[mid].blue;
 				color->flags = DoRed | DoGreen | DoBlue;
-				delete startptr;
 				return True;
 			}
 	}
-	delete startptr;
 	return False;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1200,8 +1200,9 @@ void MCUIDC::siguser()`
`1200`	`1200`	`Boolean MCUIDC::lookupcolor(MCStringRef s, MCColor *color)`
`1201`	`1201`	`{`
`1202`	`1202`	`uint4 slength = MCStringGetLength(s);`
`1203`		`- char *startptr = new char[slength + 1];`
`1204`		`- char *sptr = startptr;`
	`1203`	`+ MCAutoPointer<char> startptr;`
	`1204`	`+ startptr = new char[slength + 1];`
	`1205`	`+ char sptr = startptr;`
`1205`	`1206`	`MCU_lower(sptr, MCStringGetOldString(s));`
`1206`	`1207`	`sptr[slength] = '\0';`
`1207`	`1208`	`if (*sptr == '#')`
`@@ -1229,10 +1230,7 @@ Boolean MCUIDC::lookupcolor(MCStringRef s, MCColor *color)`
`1229`	`1230`	`if (c >= 'a' && c <= 'f')`
`1230`	`1231`	`b \|= c - ('a' - 10);`
`1231`	`1232`	`else`
`1232`		`- {`
`1233`		`- delete startptr;`
`1234`	`1233`	`return False;`
`1235`		`- }`
`1236`	`1234`	`}`
`1237`	`1235`	`}`
`1238`	`1236`	`while (*sptr != '\0');`
`@@ -1256,7 +1254,6 @@ Boolean MCUIDC::lookupcolor(MCStringRef s, MCColor *color)`
`1256`	`1254`	`shiftbits -= goodbits;`
`1257`	`1255`	`}`
`1258`	`1256`	`color->flags = DoRed \| DoGreen \| DoBlue;`
`1259`		`- delete startptr;`
`1260`	`1257`	`return True;`
`1261`	`1258`	`}`
`1262`	`1259`	`char *tptr = sptr;`
`@@ -1283,11 +1280,9 @@ Boolean MCUIDC::lookupcolor(MCStringRef s, MCColor *color)`
`1283`	`1280`	`color->green = (color_table[mid].green << 8) + color_table[mid].green;`
`1284`	`1281`	`color->blue = (color_table[mid].blue << 8) + color_table[mid].blue;`
`1285`	`1282`	`color->flags = DoRed \| DoGreen \| DoBlue;`
`1286`		`- delete startptr;`
`1287`	`1283`	`return True;`
`1288`	`1284`	`}`
`1289`	`1285`	`}`
`1290`		`- delete startptr;`
`1291`	`1286`	`return False;`
`1292`	`1287`	`}`
`1293`	`1288`