فهرست منبع

Fixed two inconsistencies on failed allocation.

Philipp Wiesemann 10 سال پیش
والد
کامیت
e3f9bf3378
2فایلهای تغییر یافته به همراه6 افزوده شده و 4 حذف شده
  1. 3 2
      src/render/opengl/SDL_render_gl.c
  2. 3 2
      src/video/SDL_bmp.c

+ 3 - 2
src/render/opengl/SDL_render_gl.c

@@ -342,9 +342,10 @@ GL_HandleDebugMessage(GLenum source, GLenum type, GLuint id, GLenum severity, GL
 
     if (type == GL_DEBUG_TYPE_ERROR_ARB) {
         /* Record this error */
-        char **error_messages = SDL_realloc(data->error_messages, data->errors * sizeof(*data->error_messages));
-        ++data->errors;
+        int errors = data->errors + 1;
+        char **error_messages = SDL_realloc(data->error_messages, errors * sizeof(*data->error_messages));
         if (error_messages) {
+            data->errors = errors;
             data->error_messages = error_messages;
             data->error_messages[data->errors-1] = SDL_strdup(message);
         }

+ 3 - 2
src/video/SDL_bmp.c

@@ -307,16 +307,17 @@ SDL_LoadBMP_RW(SDL_RWops * src, int freesrc)
         }
         if ((int) biClrUsed > palette->ncolors) {
             SDL_Color *colors;
-            palette->ncolors = biClrUsed;
+            int ncolors = biClrUsed;
             colors =
                 (SDL_Color *) SDL_realloc(palette->colors,
-                                          palette->ncolors *
+                                          ncolors *
                                           sizeof(*palette->colors));
             if (!colors) {
                 SDL_OutOfMemory();
                 was_error = SDL_TRUE;
                 goto done;
             }
+            palette->ncolors = ncolors;
             palette->colors = colors;
         } else if ((int) biClrUsed < palette->ncolors) {
             palette->ncolors = biClrUsed;