Removed MCStringGetCString from deploy_linux.cpp / deploy_sign.cpp / deploy_windows.cpp

livecodepanos · livecodepanos · commit 6ffbb26ceaac · 2013-11-18T14:44:00.000Z
diff --git a/engine/src/deploy_linux.cpp b/engine/src/deploy_linux.cpp
@@ -876,7 +876,11 @@ Exec_stat MCDeployToELF(const MCDeployParameters& p_params, bool p_is_android)
 	// If on Mac OS X or Linux, make the file executable
 #if defined(_MACOSX) || defined(_LINUX)
 	if (t_success)
-		chmod(MCStringGetCString(t_path), 0755);
+    {
+        MCAutoStringRefAsUTF8String t_utf8_path;
+        /* UNCHECKED */ t_utf8_path . Lock(t_path);
+        chmod(*t_utf8_path, 0755);
+        }
 #endif
 	
 	return t_success ? ES_NORMAL : ES_ERROR;
diff --git a/engine/src/deploy_sign.cpp b/engine/src/deploy_sign.cpp
@@ -1046,7 +1046,9 @@ bool MCDeploySignWindows(const MCDeploySignParameters& p_params)
 	t_output = nil;
 	if (t_success)
 	{
-		t_output = BIO_new_file(MCStringGetCString(p_params . output), "wb");
+        MCAutoStringRefAsUTF8String t_params_output_utf8;
+        /* UNCHECKED */ t_params_output_utf8 . Lock(p_params . output);
+		t_output = BIO_new_file(*t_params_output_utf8, "wb");
 		if (t_output == nil)
 			t_success = MCDeployThrow(kMCDeployErrorNoOutput);
 	}
diff --git a/engine/src/deploy_windows.cpp b/engine/src/deploy_windows.cpp
@@ -1075,7 +1075,9 @@ static void MCWindowsVersionInfoDestroy(MCWindowsVersionInfo *self)
 static uint64_t MCWindowsVersionInfoParseVersion(MCStringRef p_string)
 {
 	uint32_t a, b, c, d;
-	if (sscanf(MCStringGetCString(p_string), "%u.%u.%u.%u", &a, &b, &c, &d) != 4)
+    MCAutoStringRefAsUTF8String t_string_utf8;
+    /* UNCHECKED */ t_string_utf8 . Lock(p_string);
+	if (sscanf(*t_string_utf8, "%u.%u.%u.%u", &a, &b, &c, &d) != 4)
 		return 0;
 	return 0ULL | ((uint64_t)a << 48) | ((uint64_t)b << 32) | (c << 16) | d;
 }
@@ -1100,7 +1102,7 @@ static bool add_version_info_entry(void *p_context, MCArrayRef p_array, MCNameRe
 		t_bytes[t_byte_count - 2] = '\0';
 		t_bytes[t_byte_count - 1] = '\0';	 
 	}
-	return MCWindowsVersionInfoAdd((MCWindowsVersionInfo *)p_context, MCStringGetCString(MCNameGetString(p_key)), true, t_bytes, t_byte_count, t_string);
+	return MCWindowsVersionInfoAdd((MCWindowsVersionInfo *)p_context, MCNameGetCString(p_key), true, t_bytes, t_byte_count, t_string);
 }
 
 static bool MCWindowsResourcesAddVersionInfo(MCWindowsResources& self, MCArrayRef p_info)

Original file line number	Diff line number	Diff line change
`@@ -1046,7 +1046,9 @@ bool MCDeploySignWindows(const MCDeploySignParameters& p_params)`
`1046`	`1046`	`t_output = nil;`
`1047`	`1047`	`if (t_success)`
`1048`	`1048`	`{`
`1049`		`- t_output = BIO_new_file(MCStringGetCString(p_params . output), "wb");`
	`1049`	`+ MCAutoStringRefAsUTF8String t_params_output_utf8;`
	`1050`	`+ /* UNCHECKED */ t_params_output_utf8 . Lock(p_params . output);`
	`1051`	`+ t_output = BIO_new_file(*t_params_output_utf8, "wb");`
`1050`	`1052`	`if (t_output == nil)`
`1051`	`1053`	`t_success = MCDeployThrow(kMCDeployErrorNoOutput);`
`1052`	`1054`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1075,7 +1075,9 @@ static void MCWindowsVersionInfoDestroy(MCWindowsVersionInfo *self)`
`1075`	`1075`	`static uint64_t MCWindowsVersionInfoParseVersion(MCStringRef p_string)`
`1076`	`1076`	`{`
`1077`	`1077`	`uint32_t a, b, c, d;`
`1078`		`- if (sscanf(MCStringGetCString(p_string), "%u.%u.%u.%u", &a, &b, &c, &d) != 4)`
	`1078`	`+ MCAutoStringRefAsUTF8String t_string_utf8;`
	`1079`	`+ /* UNCHECKED */ t_string_utf8 . Lock(p_string);`
	`1080`	`+ if (sscanf(*t_string_utf8, "%u.%u.%u.%u", &a, &b, &c, &d) != 4)`
`1079`	`1081`	`return 0;`
`1080`	`1082`	`return 0ULL \| ((uint64_t)a << 48) \| ((uint64_t)b << 32) \| (c << 16) \| d;`
`1081`	`1083`	`}`
`@@ -1100,7 +1102,7 @@ static bool add_version_info_entry(void *p_context, MCArrayRef p_array, MCNameRe`
`1100`	`1102`	`t_bytes[t_byte_count - 2] = '\0';`
`1101`	`1103`	`t_bytes[t_byte_count - 1] = '\0';`
`1102`	`1104`	`}`
`1103`		`- return MCWindowsVersionInfoAdd((MCWindowsVersionInfo *)p_context, MCStringGetCString(MCNameGetString(p_key)), true, t_bytes, t_byte_count, t_string);`
	`1105`	`+ return MCWindowsVersionInfoAdd((MCWindowsVersionInfo *)p_context, MCNameGetCString(p_key), true, t_bytes, t_byte_count, t_string);`
`1104`	`1106`	`}`
`1105`	`1107`
`1106`	`1108`	`static bool MCWindowsResourcesAddVersionInfo(MCWindowsResources& self, MCArrayRef p_info)`