[PATCH 0/1] MR1584: appwiz: Fix memory leak on realloc failure in install_from_registered_dir (cppcheck).

[Alex Henrie (＠alexhenrie)]

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/1584

[PATCH 1/1] appwiz: Fix memory leak on realloc failure in install_from_registered_dir (cppcheck).

[Alex Henrie]

From: Alex Henrie <alexhenrie24(a)gmail.com>

---
 dlls/appwiz.cpl/addons.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c
index c63106de95b..a5fdda3e81f 100644
--- a/dlls/appwiz.cpl/addons.c
+++ b/dlls/appwiz.cpl/addons.c
@@ -255,7 +255,7 @@ static HKEY open_config_key(void)
 
 static enum install_res install_from_registered_dir(void)
 {
-    char *package_dir;
+    char *package_dir, *new_package_dir;
     HKEY hkey;
     DWORD res, type, size = MAX_PATH;
     enum install_res ret;
@@ -267,8 +267,11 @@ static enum install_res install_from_registered_dir(void)
     package_dir = malloc(size);
     res = RegGetValueA(hkey, NULL, addon->dir_config_key, RRF_RT_ANY, &type, (PBYTE)package_dir, &size);
     if(res == ERROR_MORE_DATA) {
-        package_dir = realloc(package_dir, size);
-        res = RegGetValueA(hkey, NULL, addon->dir_config_key, RRF_RT_ANY, &type, (PBYTE)package_dir, &size);
+        new_package_dir = realloc(package_dir, size);
+        if(new_package_dir) {
+            package_dir = new_package_dir;
+            res = RegGetValueA(hkey, NULL, addon->dir_config_key, RRF_RT_ANY, &type, (PBYTE)package_dir, &size);
+        }
     }
     RegCloseKey(hkey);
     if(res == ERROR_FILE_NOT_FOUND) {
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/1584

[PATCH 1/1] appwiz: Fix memory leak on realloc failure in install_from_registered_dir (cppcheck).

[Marvin]

Hi,

It looks like your patch introduced the new failures shown below.
Please investigate and fix them before resubmitting your patch.
If they are not new, fixing them anyway would help a lot. Otherwise
please ask for the known failures list to be updated.

The tests also ran into some preexisting test failures. If you know how
to fix them that would be helpful. See the TestBot job for the details:

The full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=126904

Your paranoid android.


=== debian11 (32 bit report) ===

wldap32:
parse.c:245: Test failed: ldap_get_next_page_s failed 0x51
parse.c:246: Test failed: expected res != NULL
parse.c:247: Test failed: got 3735928559
Unhandled exception: page fault on read access to 0x0000001c in 32-bit code (0x6f8d7bce).