[PATCH 0/1] MR1585: vbscript: Fix memory leak on realloc failure in Global_Split (cppcheck).

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

[Alex Henrie]

From: Alex Henrie

---
 dlls/vbscript/global.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c
index 98c705f4712..9eac80218fd 100644
--- a/dlls/vbscript/global.c
+++ b/dlls/vbscript/global.c
@@ -2574,7 +2574,7 @@ static HRESULT Global_Split(BuiltinDisp *This, VARIANT *args, unsigned args_cnt,
 {
     BSTR str, string, delimiter = NULL;
     int count, max, mode, len, start, end, ret, delimiterlen = 1;
-    int i,*indices = NULL, indices_max = 8;
+    int i, *indices = NULL, *new_indices, indices_max = 8;
     SAFEARRAYBOUND bounds;
     SAFEARRAY *sa = NULL;
     VARIANT *data, var;
@@ -2656,12 +2656,13 @@ static HRESULT Global_Split(BuiltinDisp *This, VARIANT *args, unsigned args_cnt,
         }

if (count == indices_max) {
-            indices_max *= 2;
-            indices = realloc( indices, indices_max * sizeof(int));
-            if(!indices) {
+            new_indices = realloc(indices, indices_max * 2 * sizeof(int));
+            if(!new_indices) {
                 hres = E_OUTOFMEMORY;
                 goto error;
             }
+            indices = new_indices;
+            indices_max *= 2;
         }
         indices[count++] = end;

[PATCH 1/1] vbscript: Fix memory leak on realloc failure in Global_Split (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=126905

Your paranoid android.

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

msctf:
inputprocessor.c:2437: Test failed: Expected DocumentMgr not focused
Unhandled exception: page fault on read access to 0x00000000 in 32-bit code (0x0040ae26).

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).

[PATCH 0/1] MR1585: vbscript: Fix memory leak on realloc failure in Global_Split (cppcheck). - approved

[Jacek Caban (＠jacek)]

This merge request was approved by Jacek Caban.