Fixed bug 3093 - Memory Leak in TTF_RenderUTF8_Blended_Wrapped

Pankaj I have found that in function "SDL_Surface *TTF_RenderUTF8_Blended_Wrapped(TTF_Font *font, const char *text, SDL_Color fg, Uint32 wrapLength)" It is allocating "str" then allocating "strLines". If "strLines" fails to allocate, error for out of memory is set and returned NULL. But memory allocated for "str" is not freed. There should be code for freeing the memory allocated to "str" in do-while loop where NULL has returned for allocating "strLines"
libsdl-org · Sep 10, 2017 · 90a83a6 · 90a83a6
1 parent 88bf957
commit 90a83a6
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/SDL_ttf.c b/SDL_ttf.c
@@ -1931,7 +1931,7 @@ SDL_Surface *TTF_RenderUTF8_Blended_Wrapped(TTF_Font *font,
     FT_UInt prev_index = 0;
     const int lineSpace = 2;
     int line, numLines, rowSize;
-    char *str, **strLines;
+    char *str, **strLines, **newLines;
     size_t textlen;
 
     TTF_CHECKPOINTER(text, NULL);
@@ -1964,11 +1964,14 @@ SDL_Surface *TTF_RenderUTF8_Blended_Wrapped(TTF_Font *font,
         tok = str;
         end = str + str_len;
         do {
-            strLines = (char **)SDL_realloc(strLines, (numLines+1)*sizeof(*strLines));
-            if (!strLines) {
+            newLines = (char **)SDL_realloc(strLines, (numLines+1)*sizeof(*strLines));
+            if (!newLines) {
                 TTF_SetError("Out of memory");
+                SDL_free(strLines);
+                SDL_stack_free(str);
                 return(NULL);
             }
+            strLines = newLines;
             strLines[numLines++] = tok;
 
             /* Look for the end of the line */
@@ -2064,6 +2067,10 @@ SDL_Surface *TTF_RenderUTF8_Blended_Wrapped(TTF_Font *font,
             if (error) {
                 TTF_SetFTError("Couldn't find glyph", error);
                 SDL_FreeSurface(textbuf);
+                if (strLines) {
+                    SDL_free(strLines);
+                    SDL_stack_free(str);
+                }
                 return NULL;
             }
             glyph = font->current;