[[ Bug 14413 ]] Releasing the string created by the engine was causing a crash on Windows.

livecodesebastien · livecodesebastien · commit 6a6c5551b1ea · 2015-03-13T15:22:23.000Z
Changed ConvertCStringFromNativeToUTF8 to return a engine-free'd string.
diff --git a/engine/src/externalv0.cpp b/engine/src/externalv0.cpp
@@ -1737,6 +1737,8 @@ static char *convert_from_native_to_utf8(const char *arg1, const char *arg2,
     }
     
     *retval = xresSucc;
+	// Return a string owned by the engine, to avoid the release issue
+	MCExternalAddAllocatedString(MCexternalallocpool, t_utf8_string);
     return t_utf8_string;
 }
 
@@ -1755,6 +1757,8 @@ static char *convert_to_native_from_utf8(const char *arg1, const char *arg2,
     }
     
     *retval = xresSucc;
+	// Return a string owned by the engine, to avoid the release issue
+	MCExternalAddAllocatedString(MCexternalallocpool, t_native_string);
     return t_native_string;
 }
 
diff --git a/libexternal/include/revolution/external.h b/libexternal/include/revolution/external.h
@@ -514,8 +514,9 @@ extern Bool SecurityCanAccessLibraryUTF8(const char *p_library);
     
 
 // SN-2015-03-12: [[ Bug 14413 ]] Added UTF-8 <-> native string conversion
-extern char *ConvertCStringFromNativeToUTF8(const char *p_native, int *r_success);
-extern char *ConvertCStringToNativeFromUTF8(const char *p_utf8, int *r_success);
+// The string returned are owned by the engine, and must not be free'd
+extern const char *ConvertCStringFromNativeToUTF8(const char *p_native, int *r_success);
+extern const char *ConvertCStringToNativeFromUTF8(const char *p_utf8, int *r_success);
 	
 #ifdef __cplusplus
 };
diff --git a/libexternal/src/external.c b/libexternal/src/external.c
@@ -911,7 +911,7 @@ void ResolveSymbolInModule(void *p_handle, const char *p_symbol, void **r_resolv
 ////////////////////////////////////////////////////////////////////////////////
 // V4: UTF-8 <-> native string conversion
 
-char *ConvertCStringFromNativeToUTF8(const char *p_native, int *r_success)
+const char *ConvertCStringFromNativeToUTF8(const char *p_native, int *r_success)
 {
     char *t_result;
     
@@ -926,7 +926,7 @@ char *ConvertCStringFromNativeToUTF8(const char *p_native, int *r_success)
     return t_result;
 }
 
-char *ConvertCStringToNativeFromUTF8(const char *p_utf8, int *r_success)
+const char *ConvertCStringToNativeFromUTF8(const char *p_utf8, int *r_success)
 {
     char *t_result;
     
diff --git a/revzip/src/revzip.cpp b/revzip/src/revzip.cpp
@@ -1279,19 +1279,19 @@ void revZipEnumerateItems(char *p_arguments[], int p_argument_count, char **r_re
 			}
 			else
 			{
-				char *t_converted_name;
-                int t_success;
-
 				// SN-2015-03-10: [[ Bug 14413 ]] We convert the string to UTF-8
 				//  in case it was natively encoded, as revZipEnumerateItems is
 				//  meant to return a UTF-8 encoded string.
+				const char *t_converted_name;
+                int t_success;
+
 				if (t_stat.bitflags && ZIP_UTF8_FLAG)
 				{
                     t_success = EXTERNAL_SUCCESS;
-					t_converted_name = strdup(t_stat.name);
+					t_converted_name = t_stat.name;
 				}
 				else
-                    t_converted_name = ConvertCStringFromNativeToUTF8(t_stat.name, &t_success);
+					t_converted_name = ConvertCStringFromNativeToUTF8(t_stat.name, &t_success);
 
                 if (t_success == EXTERNAL_SUCCESS)
 				{
@@ -1304,9 +1304,6 @@ void revZipEnumerateItems(char *p_arguments[], int p_argument_count, char **r_re
 					t_error  = True;
 					break;
 				}
-
-				// Free the allocated memory.
-				free(t_converted_name);
 			}
 		}
 		

Original file line number	Diff line number	Diff line change
`@@ -1737,6 +1737,8 @@ static char convert_from_native_to_utf8(const char arg1, const char *arg2,`
`1737`	`1737`	`}`
`1738`	`1738`
`1739`	`1739`	`*retval = xresSucc;`
	`1740`	`+ // Return a string owned by the engine, to avoid the release issue`
	`1741`	`+ MCExternalAddAllocatedString(MCexternalallocpool, t_utf8_string);`
`1740`	`1742`	`return t_utf8_string;`
`1741`	`1743`	`}`
`1742`	`1744`
`@@ -1755,6 +1757,8 @@ static char convert_to_native_from_utf8(const char arg1, const char *arg2,`
`1755`	`1757`	`}`
`1756`	`1758`
`1757`	`1759`	`*retval = xresSucc;`
	`1760`	`+ // Return a string owned by the engine, to avoid the release issue`
	`1761`	`+ MCExternalAddAllocatedString(MCexternalallocpool, t_native_string);`
`1758`	`1762`	`return t_native_string;`
`1759`	`1763`	`}`
`1760`	`1764`
Original file line number	Diff line number	Diff line change
`@@ -911,7 +911,7 @@ void ResolveSymbolInModule(void p_handle, const char p_symbol, void **r_resolv`
`911`	`911`	`////////////////////////////////////////////////////////////////////////////////`
`912`	`912`	`// V4: UTF-8 <-> native string conversion`
`913`	`913`
`914`		`-char ConvertCStringFromNativeToUTF8(const char p_native, int *r_success)`
	`914`	`+const char ConvertCStringFromNativeToUTF8(const char p_native, int *r_success)`
`915`	`915`	`{`
`916`	`916`	`char *t_result;`
`917`	`917`
`@@ -926,7 +926,7 @@ char ConvertCStringFromNativeToUTF8(const char p_native, int *r_success)`
`926`	`926`	`return t_result;`
`927`	`927`	`}`
`928`	`928`
`929`		`-char ConvertCStringToNativeFromUTF8(const char p_utf8, int *r_success)`
	`929`	`+const char ConvertCStringToNativeFromUTF8(const char p_utf8, int *r_success)`
`930`	`930`	`{`
`931`	`931`	`char *t_result;`
`932`	`932`
Original file line number	Diff line number	Diff line change
`@@ -1279,19 +1279,19 @@ void revZipEnumerateItems(char p_arguments[], int p_argument_count, char *r_re`
`1279`	`1279`	`}`
`1280`	`1280`	`else`
`1281`	`1281`	`{`
`1282`		`- char *t_converted_name;`
`1283`		`- int t_success;`
`1284`		`-`
`1285`	`1282`	`// SN-2015-03-10: [[ Bug 14413 ]] We convert the string to UTF-8`
`1286`	`1283`	`// in case it was natively encoded, as revZipEnumerateItems is`
`1287`	`1284`	`// meant to return a UTF-8 encoded string.`
	`1285`	`+ const char *t_converted_name;`
	`1286`	`+ int t_success;`
	`1287`	`+`
`1288`	`1288`	`if (t_stat.bitflags && ZIP_UTF8_FLAG)`
`1289`	`1289`	`{`
`1290`	`1290`	`t_success = EXTERNAL_SUCCESS;`
`1291`		`- t_converted_name = strdup(t_stat.name);`
	`1291`	`+ t_converted_name = t_stat.name;`
`1292`	`1292`	`}`
`1293`	`1293`	`else`
`1294`		`- t_converted_name = ConvertCStringFromNativeToUTF8(t_stat.name, &t_success);`
	`1294`	`+ t_converted_name = ConvertCStringFromNativeToUTF8(t_stat.name, &t_success);`
`1295`	`1295`
`1296`	`1296`	`if (t_success == EXTERNAL_SUCCESS)`
`1297`	`1297`	`{`
`@@ -1304,9 +1304,6 @@ void revZipEnumerateItems(char p_arguments[], int p_argument_count, char *r_re`
`1304`	`1304`	`t_error = True;`
`1305`	`1305`	`break;`
`1306`	`1306`	`}`
`1307`		`-`
`1308`		`- // Free the allocated memory.`
`1309`		`- free(t_converted_name);`
`1310`	`1307`	`}`
`1311`	`1308`	`}`
`1312`	`1309`