Cleanup.

Recently, I seem to have forgotten that VLAs need to be freed, too.
thpatch · Aug 20, 2013 · 2b7c110 · 2b7c110
1 parent 089896a
commit 2b7c110
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 14 deletions.
diff --git a/thcrap/src/bp_file.c b/thcrap/src/bp_file.c
@@ -75,15 +75,13 @@ int BP_file_name(x86_reg_t *regs, json_t *bp_info)
 	if(fr->name) {
 		file_rep_clear(fr);
 	}
-
 	fn_len = strlen(*file_name) + 1;
 	fr->name = EnsureUTF8(*file_name, fn_len);
 	fr->rep_buffer = stack_game_file_resolve(fr->name, &fr->rep_size);
 	fr->hooks = patchhooks_build(fr->name);
 	if(fr->hooks) {
 		size_t diff_fn_len = fn_len + strlen(".jdiff") + 1;
 		size_t diff_size = 0;
-
 		{
 			VLA(char, diff_fn, diff_fn_len);
 			strcpy(diff_fn, fr->name);

diff --git a/thcrap/src/init.c b/thcrap/src/init.c
@@ -136,14 +136,14 @@ json_t* identify(const char *exe_fn)
 	json_object_set(run_cfg, "build", json_array_get(id_array, 1));
 
 	{
-		size_t ver_fn_len = strlen(game) + 1 + strlen(".js") + 1;
-		VLA(char, ver_fn, ver_fn_len);
-
 		log_printf("→ %s %s %s\n", game, build, variety);
-			
+
 		if(stricmp(PathFindExtensionA(game), ".js")) {
+			size_t ver_fn_len = strlen(game) + 1 + strlen(".js") + 1;
+			VLA(char, ver_fn, ver_fn_len);
 			sprintf(ver_fn, "%s.js", game);
 			run_ver = stack_json_resolve(ver_fn, NULL);
+			VLA_FREE(ver_fn);
 		} else {
 			run_ver = stack_json_resolve(game, NULL);
 		}
@@ -239,7 +239,6 @@ int thcrap_init(const char *setup_fn)
 		json_decref(run_cfg);
 		run_cfg = run_ver;
 	}
-
 	{
 		// Copy format links from formats.js
 		json_t *game_formats = json_object_get(run_cfg, "formats");
@@ -258,7 +257,6 @@ int thcrap_init(const char *setup_fn)
 			json_decref(formats_js);
 		}
 	}
-
 	log_printf("Initializing patches...\n");
 	{
 		json_t *patches = json_object_get(run_cfg, "patches");

diff --git a/thcrap/src/textdisp.c b/thcrap/src/textdisp.c
@@ -29,7 +29,6 @@ HFONT WINAPI textdisp_CreateFontA(
 {
 	int replaced = 0;
 	const char *string_font;
-	json_t *run_font;
 
 	iCharSet = DEFAULT_CHARSET;
 
@@ -40,7 +39,7 @@ HFONT WINAPI textdisp_CreateFontA(
 		pszFaceName = string_font;
 		replaced = 1;
 	} else {
-		run_font = json_object_get(run_cfg, "font");
+		json_t *run_font = json_object_get(run_cfg, "font");
 		if(json_is_string(run_font)) {
 			pszFaceName = json_string_value(run_font);
 			replaced = 1;

diff --git a/thcrap_tsa/src/layout.c b/thcrap_tsa/src/layout.c
@@ -46,7 +46,7 @@ int layout_match_set(json_t *arr, size_t ind, const char *str, size_t len)
 		strncpy(arg, str, len);
 		arg[len] = 0;
 		json_str = json_string(arg);
-
+		VLA_FREE(arg);
 		return json_array_set_expand(arr, ind, json_str);
 	}
 }

diff --git a/thcrap_tsa/src/thcrap_tsa.h b/thcrap_tsa/src/thcrap_tsa.h
@@ -36,7 +36,6 @@ typedef void (*EncryptionFunc_t)(
 /// ------
 /// Spells
 /// ------
-
 /**
   * Reads a spell card ID.
   *

diff --git a/win32_utf8/src/kernel32_dll.c b/win32_utf8/src/kernel32_dll.c
@@ -250,9 +250,11 @@ DWORD WINAPI GetEnvironmentVariableU(
 	VLA(wchar_t, lpBuffer_w, nSize);
 	StringToUTF16(lpName_w, lpName, lpName_len);
 
-	ret = GetEnvironmentVariableW(lpName_w, lpBuffer_w, nSize);
+	GetEnvironmentVariableW(lpName_w, lpBuffer_w, nSize);
 	// Return the converted size (!)
-	return StringToUTF8(lpBuffer, lpBuffer_w, nSize);
+	ret = StringToUTF8(lpBuffer, lpBuffer_w, nSize);
+	VLA_FREE(lpBuffer_w);
+	return ret;
 }
 
 DWORD WINAPI GetModuleFileNameU(