src/render/software/SDL_drawpoint.c
author Philipp Wiesemann <philipp.wiesemann@arcor.de>
Wed, 29 Oct 2014 20:20:47 +0100
changeset 9201 21d9f9babb30
parent 8149 681eb46b8ac4
child 9619 b94b6d0bff0f
permissions -rw-r--r--
Fixed bug 2647 - Memory leak in SDL_AddHintCallback function - SDL_hints.c

Nitz

Variable entry going out of scope leaks the storage it points to, at:

/* Need to add a hint entry for this watcher */
hint = (SDL_Hint *)SDL_malloc(sizeof(*hint));
if (!hint) {
return;
}

Patch is attached.
     1 /*
     2   Simple DirectMedia Layer
     3   Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
     4 
     5   This software is provided 'as-is', without any express or implied
     6   warranty.  In no event will the authors be held liable for any damages
     7   arising from the use of this software.
     8 
     9   Permission is granted to anyone to use this software for any purpose,
    10   including commercial applications, and to alter it and redistribute it
    11   freely, subject to the following restrictions:
    12 
    13   1. The origin of this software must not be misrepresented; you must not
    14      claim that you wrote the original software. If you use this software
    15      in a product, an acknowledgment in the product documentation would be
    16      appreciated but is not required.
    17   2. Altered source versions must be plainly marked as such, and must not be
    18      misrepresented as being the original software.
    19   3. This notice may not be removed or altered from any source distribution.
    20 */
    21 #include "../../SDL_internal.h"
    22 
    23 #if !SDL_RENDER_DISABLED
    24 
    25 #include "SDL_draw.h"
    26 #include "SDL_drawpoint.h"
    27 
    28 
    29 int
    30 SDL_DrawPoint(SDL_Surface * dst, int x, int y, Uint32 color)
    31 {
    32     if (!dst) {
    33         return SDL_SetError("Passed NULL destination surface");
    34     }
    35 
    36     /* This function doesn't work on surfaces < 8 bpp */
    37     if (dst->format->BitsPerPixel < 8) {
    38         return SDL_SetError("SDL_DrawPoint(): Unsupported surface format");
    39     }
    40 
    41     /* Perform clipping */
    42     if (x < dst->clip_rect.x || y < dst->clip_rect.y ||
    43         x >= (dst->clip_rect.x + dst->clip_rect.w) ||
    44         y >= (dst->clip_rect.y + dst->clip_rect.h)) {
    45         return 0;
    46     }
    47 
    48     switch (dst->format->BytesPerPixel) {
    49     case 1:
    50         DRAW_FASTSETPIXELXY1(x, y);
    51         break;
    52     case 2:
    53         DRAW_FASTSETPIXELXY2(x, y);
    54         break;
    55     case 3:
    56         return SDL_Unsupported();
    57     case 4:
    58         DRAW_FASTSETPIXELXY4(x, y);
    59         break;
    60     }
    61     return 0;
    62 }
    63 
    64 int
    65 SDL_DrawPoints(SDL_Surface * dst, const SDL_Point * points, int count,
    66                Uint32 color)
    67 {
    68     int minx, miny;
    69     int maxx, maxy;
    70     int i;
    71     int x, y;
    72 
    73     if (!dst) {
    74         return SDL_SetError("Passed NULL destination surface");
    75     }
    76 
    77     /* This function doesn't work on surfaces < 8 bpp */
    78     if (dst->format->BitsPerPixel < 8) {
    79         return SDL_SetError("SDL_DrawPoints(): Unsupported surface format");
    80     }
    81 
    82     minx = dst->clip_rect.x;
    83     maxx = dst->clip_rect.x + dst->clip_rect.w - 1;
    84     miny = dst->clip_rect.y;
    85     maxy = dst->clip_rect.y + dst->clip_rect.h - 1;
    86 
    87     for (i = 0; i < count; ++i) {
    88         x = points[i].x;
    89         y = points[i].y;
    90 
    91         if (x < minx || x > maxx || y < miny || y > maxy) {
    92             continue;
    93         }
    94 
    95         switch (dst->format->BytesPerPixel) {
    96         case 1:
    97             DRAW_FASTSETPIXELXY1(x, y);
    98             break;
    99         case 2:
   100             DRAW_FASTSETPIXELXY2(x, y);
   101             break;
   102         case 3:
   103             return SDL_Unsupported();
   104         case 4:
   105             DRAW_FASTSETPIXELXY4(x, y);
   106             break;
   107         }
   108     }
   109     return 0;
   110 }
   111 
   112 #endif /* !SDL_RENDER_DISABLED */
   113 
   114 /* vi: set ts=4 sw=4 expandtab: */