[[ Bug ]] Fix uses of MCStringCopyAndRelease.

runrevmark · runrevmark · commit 577706a7b50d · 2015-05-22T11:45:11.000+01:00
diff --git a/engine/src/fieldrtf.cpp b/engine/src/fieldrtf.cpp
@@ -873,7 +873,13 @@ bool MCField::exportasrtftext(uint32_t p_part_id, int32_t p_start_index, int32_t
 	/* UNCHECKED */ MCStringAppendFormat(ctxt.m_text, "\n}");
 
 	// Return the buffer.
-	return MCStringCopyAndRelease(ctxt.m_text, r_string);
+	if (!MCStringCopyAndRelease(ctxt.m_text, r_string))
+    {
+        MCValueRelease(ctxt . m_text);
+        return false;
+    }
+    
+    return true;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/engine/src/syscfdate.cpp b/engine/src/syscfdate.cpp
@@ -370,8 +370,9 @@ static bool osx_cf_fetch_format(CFLocaleRef p_locale, CFDateFormatterStyle p_dat
 		CFRelease(t_formatter);
 	
 	if (t_success)
-        MCStringCopyAndRelease(t_format, r_string);
-    else
+        t_success = MCStringCopyAndRelease(t_format, r_string);
+    
+    if (!t_success)
         MCValueRelease(t_format);
     
     return t_success;
diff --git a/libfoundation/src/foundation-list.cpp b/libfoundation/src/foundation-list.cpp
@@ -254,69 +254,3 @@ bool __MCListImmutableCopy(__MCList *self, bool p_release, __MCList*& r_immutabl
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-
-#if 0
-bool MCListCreateMutable(char p_delimiter, MCListRef& r_list)
-{
-	MCListRef self;
-	if (!MCMemoryNew(self))
-		return false;
-
-	if (!MCStringCreateMutable(0, self -> buffer))
-	{
-		MCMemoryDelete(self);
-		return false;
-	}
-
-	self -> delimiter = p_delimiter;
-
-	r_list = self;
-	return true;
-}
-
-void MCListDestroy(MCListRef self)
-{
-	MCValueRelease(self -> buffer);
-	MCMemoryDelete(self);
-}
-
-bool MCListCopyAsStringAndRelease(MCListRef self, MCStringRef& r_string)
-{
-	if (!MCStringCopyAndRelease(self -> buffer, r_string))
-		return false;
-
-	MCMemoryDelete(self);
-
-	return true;
-}
-
-bool MCListAppend(MCListRef self, MCStringRef p_string)
-{
-	if (MCStringGetLength(self -> buffer) != 0 &&
-		!MCStringAppendNativeChars(self -> buffer, &self -> delimiter, 1))
-		return false;
-
-	return MCStringAppend(self -> buffer, p_string);
-}
-
-bool MCListAppendCString(MCListRef self, const char *p_cstring)
-{
-	return MCListAppendNativeChars(self, p_cstring, MCCStringLength(p_cstring));
-}
-
-bool MCListAppendOldString(MCListRef self, const MCString& p_oldstring)
-{
-	return MCListAppendNativeChars(self, p_oldstring . getstring(), p_oldstring . getlength());
-}
-
-bool MCListAppendNativeChars(MCListRef self, const char *p_chars, uindex_t p_char_count)
-{
-	if (MCStringGetLength(self -> buffer) != 0 &&
-		!MCStringAppendNativeChars(self -> buffer, &self -> delimiter, 1))
-		return false;
-
-	return MCStringAppendNativeChars(self -> buffer, p_chars, p_char_count);
-}
-#endif
-
-////////////////////////////////////////////////////////////////////////////////
diff --git a/libfoundation/src/foundation-set.cpp b/libfoundation/src/foundation-set.cpp
@@ -349,11 +349,12 @@ bool __MCSetCopyDescription(__MCSet *self, MCStringRef& r_string)
 	if (t_success)
 		t_success = MCStringAppendFormat(t_string, "}");
 	if (t_success)
-		return MCStringCopyAndRelease(t_string, r_string);
+		t_success = MCStringCopyAndRelease(t_string, r_string);
 	
-	MCValueRelease(t_string);
+    if (!t_success)
+        MCValueRelease(t_string);
 
-	return false;
+	return t_success;
 }
 
 bool __MCSetImmutableCopy(__MCSet *self, bool p_release, __MCSet*& r_immutable_value)
diff --git a/libfoundation/src/foundation-string.cpp b/libfoundation/src/foundation-string.cpp
@@ -814,6 +814,9 @@ bool MCStringFormatV(MCStringRef& r_string, const char *p_format, va_list p_args
 
 	if (t_success)
 		t_success = MCStringCopyAndRelease(t_buffer, r_string);
+    
+    if (!t_success)
+		MCValueRelease (t_buffer);
 	
 	return t_success;
 }

Original file line number	Diff line number	Diff line change
`@@ -814,6 +814,9 @@ bool MCStringFormatV(MCStringRef& r_string, const char *p_format, va_list p_args`
`814`	`814`
`815`	`815`	`if (t_success)`
`816`	`816`	`t_success = MCStringCopyAndRelease(t_buffer, r_string);`
	`817`	`+`
	`818`	`+ if (!t_success)`
	`819`	`+ MCValueRelease (t_buffer);`
`817`	`820`
`818`	`821`	`return t_success;`
`819`	`822`	`}`