[PATCH 0/1] MR2121: winhlp32: Fix memory leak on realloc failure in HLPFILE_RtfAddBitmap (cppcheck).

[Alex Henrie (＠alexhenrie)]

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

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

[Alex Henrie]

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

---
 programs/winhlp32/hlpfile.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/programs/winhlp32/hlpfile.c b/programs/winhlp32/hlpfile.c
index e8ae723cff0..4fb6853cfe6 100644
--- a/programs/winhlp32/hlpfile.c
+++ b/programs/winhlp32/hlpfile.c
@@ -966,6 +966,7 @@ static BOOL HLPFILE_RtfAddBitmap(struct RtfData* rd, HLPFILE* file, const BYTE*
     const BYTE*         pict_beg;
     BYTE*               alloc = NULL;
     BITMAPINFO*         bi;
+    BITMAPINFO*         new_bi;
     ULONG               off, csz;
     unsigned            nc = 0;
     BOOL                clrImportant = FALSE;
@@ -1013,8 +1014,13 @@ static BOOL HLPFILE_RtfAddBitmap(struct RtfData* rd, HLPFILE* file, const BYTE*
         if (!nc && bi->bmiHeader.biBitCount <= 8)
             nc = 1 << bi->bmiHeader.biBitCount;
 
-        bi = realloc(bi, sizeof(*bi) + nc * sizeof(RGBQUAD));
-        if (!bi) return FALSE;
+        new_bi = realloc(bi, sizeof(*bi) + nc * sizeof(RGBQUAD));
+        if (!new_bi)
+        {
+            free(bi);
+            return FALSE;
+        }
+        bi = new_bi;
         for (i = 0; i < nc; i++)
         {
             bi->bmiColors[i].rgbBlue     = ptr[0];
-- 
GitLab

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