Updates after feedback #1

livecodepanos · livecodepanos · commit 532ac6adae3d · 2013-09-13T14:12:51.000+01:00
diff --git a/engine/src/fieldhtml.cpp b/engine/src/fieldhtml.cpp
@@ -1854,22 +1854,23 @@ static void import_html_parse_paragraph_attrs(import_html_tag_t& p_tag, MCFieldP
 				r_style . space_below = atoi(t_value);
 			break;
 			case kImportHtmlAttrTabStops:
+            {
 				if (r_style . has_tabs)
 				{
 					delete r_style . tabs;
 					r_style . tabs = nil;
 					r_style . has_tabs = false;
 				}
-                MCStringRef t_value_str;
-                /* UNCHECKED */ MCStringCreateWithCString(t_value, t_value_str);
-				if (MCField::parsetabstops(P_TAB_STOPS, t_value_str, r_style . tabs, r_style . tab_count))
+                MCAutoStringRef t_value_str;
+                /* UNCHECKED */ MCStringCreateWithCString(t_value, &t_value_str);
+				if (MCField::parsetabstops(P_TAB_STOPS, *t_value_str, r_style . tabs, r_style . tab_count))
                 {
 					r_style . has_tabs = true;
-                    MCValueRelease(t_value_str);
                 }
+            }
 			break;
 			case kImportHtmlAttrBgColor:
-			{
+            {
 				MCAutoStringRef t_value_str;
 				/* UNCHECKED */ MCStringCreateWithCString(t_value, &t_value_str);
 				MCColor t_color;
@@ -1879,15 +1880,15 @@ static void import_html_parse_paragraph_attrs(import_html_tag_t& p_tag, MCFieldP
 					r_style . has_background_color = true;
 					r_style . background_color = t_color . pixel;
 				}
-			}
+            }
 			break;
 			case kImportHtmlAttrBorderWidth:
+            
 				r_style . has_border_width = true;
 				r_style . border_width = atoi(t_value);
-            
 			break;
 			case kImportHtmlAttrBorderColor:
-			{
+            {
 				MCAutoStringRef t_value_str;
 				/* UNCHECKED */ MCStringCreateWithCString(t_value, &t_value_str);
 				MCColor t_color;
@@ -1897,7 +1898,7 @@ static void import_html_parse_paragraph_attrs(import_html_tag_t& p_tag, MCFieldP
 					r_style . has_border_color = true;
 					r_style . border_color = t_color . pixel;
 				}
-			}
+            }
 			break;
 			case kImportHtmlAttrPadding:
 				r_style . has_padding = true;
diff --git a/engine/src/stack2.cpp b/engine/src/stack2.cpp
@@ -2538,11 +2538,14 @@ void MCStack::getstackfiles(MCExecPoint &ep)
 	}
 }
 
-void MCStack::stringtostackfiles(MCStringRef d, MCStackfile **sf, uint2 &nf)
+void MCStack::stringtostackfiles(MCStringRef d_strref, MCStackfile **sf, uint2 &nf)
 {
 	MCStackfile *newsf = NULL;
 	uint2 nnewsf = 0;
-	char *eptr = strdup(MCStringGetCString(d));
+    // This ensures the coy is freed when the method ends
+    MCAutoPointer<char> d;
+    /* UNCHECKED */ d = strdup(MCStringGetCString(d_strref));
+	char *eptr = *d;
 	while ((eptr = strtok(eptr, "\n")) != NULL)
 	{
 		char *cptr = strchr(eptr, ',');
@@ -2568,9 +2571,7 @@ void MCStack::setstackfiles(MCStringRef s)
 		MCValueRelease(stackfiles[nstackfiles].filename);
 	}
 	delete stackfiles;
-    MCAutoStringRef t_copy;
-    /* UNCHECKED */ MCStringCopy(s, &t_copy);
-	stringtostackfiles(*t_copy, &stackfiles, nstackfiles);
+	stringtostackfiles(s, &stackfiles, nstackfiles);
 }
 
 char *MCStack::getstackfile(const MCString &s)

Original file line number	Diff line number	Diff line change
`@@ -2538,11 +2538,14 @@ void MCStack::getstackfiles(MCExecPoint &ep)`
`2538`	`2538`	`}`
`2539`	`2539`	`}`
`2540`	`2540`
`2541`		`-void MCStack::stringtostackfiles(MCStringRef d, MCStackfile **sf, uint2 &nf)`
	`2541`	`+void MCStack::stringtostackfiles(MCStringRef d_strref, MCStackfile **sf, uint2 &nf)`
`2542`	`2542`	`{`
`2543`	`2543`	`MCStackfile *newsf = NULL;`
`2544`	`2544`	`uint2 nnewsf = 0;`
`2545`		`- char *eptr = strdup(MCStringGetCString(d));`
	`2545`	`+ // This ensures the coy is freed when the method ends`
	`2546`	`+ MCAutoPointer<char> d;`
	`2547`	`+ /* UNCHECKED */ d = strdup(MCStringGetCString(d_strref));`
	`2548`	`+ char eptr = d;`
`2546`	`2549`	`while ((eptr = strtok(eptr, "\n")) != NULL)`
`2547`	`2550`	`{`
`2548`	`2551`	`char *cptr = strchr(eptr, ',');`
`@@ -2568,9 +2571,7 @@ void MCStack::setstackfiles(MCStringRef s)`
`2568`	`2571`	`MCValueRelease(stackfiles[nstackfiles].filename);`
`2569`	`2572`	`}`
`2570`	`2573`	`delete stackfiles;`
`2571`		`- MCAutoStringRef t_copy;`
`2572`		`- /* UNCHECKED */ MCStringCopy(s, &t_copy);`
`2573`		`- stringtostackfiles(*t_copy, &stackfiles, nstackfiles);`
	`2574`	`+ stringtostackfiles(s, &stackfiles, nstackfiles);`
`2574`	`2575`	`}`
`2575`	`2576`
`2576`	`2577`	`char *MCStack::getstackfile(const MCString &s)`