make Platform::ExecutableName return std::string (fixes minor memory leak)

update code is untested

src/Platform.cpp

@@ -20,8 +20,9 @@
 namespace Platform
 {
 
-char *ExecutableName(void)
+std::string ExecutableName()
 {
+	std::string ret;
 #if defined(WIN)
 	char *name = (char *)malloc(64);
 	DWORD max = 64, res;
@@ -41,7 +42,7 @@ char *ExecutableName(void)
 	{
 		free(fn);
 		free(name);
-		return NULL;
+		return "";
 	}
 	res = 1;
 #else
@@ -63,22 +64,23 @@ char *ExecutableName(void)
 	if (res <= 0)
 	{
 		free(name);
-		return NULL;
+		return "";
 	}
-	return name;
+	ret = name;
+	free(name);
+	return ret;
 }
 
 void DoRestart()
 {
-	char *exename = ExecutableName();
+	std::string exename = ExecutableName();
-	if (exename)
+	if (exename.length())
 	{
 #ifdef WIN
 		ShellExecute(NULL, "open", exename, NULL, NULL, SW_SHOWNORMAL);
 #elif defined(LIN) || defined(MACOSX)
-		execl(exename, "powder", NULL);
+		execl(exename.c_str(), "powder", NULL);
 #endif
-		free(exename);
 	}
 	exit(-1);
 }

src/Platform.h

@@ -5,7 +5,7 @@
 
 namespace Platform
 {
-	char * ExecutableName();
+	std::string ExecutableName();
 	void DoRestart();
 
 	void OpenURI(std::string uri);

src/Update.cpp

@@ -25,120 +25,106 @@
 
 int update_start(char *data, unsigned int len)
 {
-	char *self = Platform::ExecutableName(), *temp;
+	std::string exeName = Platform::ExecutableName(), updName;
-#ifdef WIN
-	char *p;
-#endif
 	FILE *f;
-	int res = 1;
 
-	if (!self)
+	if (!exeName.length())
 		return 1;
 
 #ifdef WIN
-	temp = (char*)malloc(strlen(self)+12);
+	updName = exeName;
-	strcpy(temp, self);
+	std::string extension = exeName.substr(exeName.length() - 4);
-	p = temp + strlen(temp) - 4;
+	if (extension == ".exe")
-	if (_stricmp(p, ".exe"))
+		updName = exeName.substr(0, exeName.length() - 4);
-		p += 4;
+	updName = updName + "_upd.exe";
-	strcpy(p, "_upd.exe");
 
-	if (!MoveFile(self, temp))
+	if (!MoveFile(exeName.c_str(), updName.c_str()))
 		goto fail;
 
-	f = fopen(self, "wb");
+	f = fopen(exeName.c_str(), "wb");
 	if (!f)
 		goto fail;
 	if (fwrite(data, 1, len, f) != len)
 	{
 		fclose(f);
-		DeleteFile(self);
+		DeleteFile(exeName.c_str());
 		goto fail;
 	}
 	fclose(f);
 
-	if ((uintptr_t)ShellExecute(NULL, "open", self, NULL, NULL, SW_SHOWNORMAL) <= 32)
+	if ((uintptr_t)ShellExecute(NULL, "open", exeName.c_str(), NULL, NULL, SW_SHOWNORMAL) <= 32)
 	{
-		DeleteFile(self);
+		DeleteFile(exeName.c_str());
 		goto fail;
 	}
 
 	return 0;
 #else
-	temp = (char*)malloc(strlen(self)+8);
+	updName = exeName + "-update";
-	strcpy(temp, self);
-	strcat(temp, "-update");
 
-	f = fopen(temp, "w");
+	f = fopen(updName.c_str(), "w");
 	if (!f)
-		goto fail;
+		return 1;
 	if (fwrite(data, 1, len, f) != len)
 	{
 		fclose(f);
-		unlink(temp);
+		unlink(updName.c_str());
-		goto fail;
+		return 1;
 	}
 	fclose(f);
 
-	if (chmod(temp, 0755))
+	if (chmod(updName.c_str(), 0755))
 	{
-		unlink(temp);
+		unlink(updName.c_str());
-		goto fail;
+		return 1;
 	}
 
-	if (rename(temp, self))
+	if (rename(updName.c_str(), exeName.c_str()))
 	{
-		unlink(temp);
+		unlink(updName.c_str());
-		goto fail;
+		return 1;
 	}
 
-	execl(self, "powder-update", NULL);
+	execl(exeName.c_str(), "powder-update", NULL);
+	return 0;
 #endif
-
-fail:
-	free(temp);
-	free(self);
-	return res;
 }
 
 int update_finish(void)
 {
 #ifdef WIN
-	char *temp, *self = Platform::ExecutableName(), *p;
+	std::string exeName = Platform::ExecutableName(), updName;
 	int timeout = 5, err;
 
 #ifdef DEBUG
-	printf("Update: Current EXE name: %s\n", self);
+	printf("Update: Current EXE name: %s\n", exeName.c_str());
 #endif
 
-	temp = (char*)malloc(strlen(self)+12);
+	updName = exeName;
-	strcpy(temp, self);
+	std::string extension = exeName.substr(exeName.length() - 4);
-	p = temp + strlen(temp) - 4;
+	if (extension == ".exe")
-	if (_stricmp(p, ".exe"))
+		updName = exeName.substr(0, exeName.length() - 4);
-		p += 4;
+	updName = updName + "_upd.exe";
-	strcpy(p, "_upd.exe");
 
 #ifdef DEBUG
-	printf("Update: Temp EXE name: %s\n", temp);
+	printf("Update: Temp EXE name: %s\n", updName.c_str());
 #endif
 
-	while (!DeleteFile(temp))
+	while (!DeleteFile(updName.c_str()))
 	{
 		err = GetLastError();
 		if (err == ERROR_FILE_NOT_FOUND)
 		{
 #ifdef DEBUG
-			printf("Update: Temp file deleted\n");
+			printf("Update: Temp file not deleted\n");
 #endif
-			free(temp);
 			// Old versions of powder toy name their update files with _update.exe, delete that upgrade file here
-			temp = (char*)malloc(strlen(self)+12);
+			updName = exeName;
-			strcpy(temp, self);
+			std::string extension = exeName.substr(exeName.length() - 4);
-			p = temp + strlen(temp) - 4;
+			if (extension == ".exe")
-			if (_stricmp(p, ".exe"))
+				updName = exeName.substr(0, exeName.length() - 4);
-				p += 4;
+			updName = updName + "_update.exe";
-			strcpy(p, "_update.exe");
+			DeleteFile(updName.c_str());
-			DeleteFile(temp);
 			return 0;
 		}
 		Sleep(500);
@@ -148,11 +134,9 @@ int update_finish(void)
 #ifdef DEBUG
 			printf("Update: Delete timeout\n");
 #endif
-			free(temp);
 			return 1;
 		}
 	}
-	free(temp);
 #endif
 	return 0;
 }

src/lua/LuaScriptInterface.cpp

@@ -3379,9 +3379,9 @@ int LuaScriptInterface::platform_releaseType(lua_State * l)
 
 int LuaScriptInterface::platform_exeName(lua_State * l)
 {
-	char *name = Platform::ExecutableName();
+	std::string name = Platform::ExecutableName();
-	if (name)
+	if (name.length())
-		lua_pushstring(l, name);
+		lua_pushstring(l, name.c_str());
 	else
 		luaL_error(l, "Error, could not get executable name");
 	return 1;