src/render/opengles2/SDL_shaders_gles2.h
author Philipp Wiesemann <philipp.wiesemann@arcor.de>
Wed, 29 Oct 2014 20:20:47 +0100
changeset 9201 21d9f9babb30
parent 9046 c3ec7c3e6c24
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_VIDEO_RENDER_OGL_ES2
    24 
    25 #ifndef SDL_shaderdata_h_
    26 #define SDL_shaderdata_h_
    27 
    28 typedef struct GLES2_ShaderInstance
    29 {
    30     GLenum type;
    31     GLenum format;
    32     int length;
    33     const void *data;
    34 } GLES2_ShaderInstance;
    35 
    36 typedef struct GLES2_Shader
    37 {
    38     int instance_count;
    39     const GLES2_ShaderInstance *instances[4];
    40 } GLES2_Shader;
    41 
    42 typedef enum
    43 {
    44     GLES2_SHADER_VERTEX_DEFAULT,
    45     GLES2_SHADER_FRAGMENT_SOLID_SRC,
    46     GLES2_SHADER_FRAGMENT_TEXTURE_ABGR_SRC,
    47     GLES2_SHADER_FRAGMENT_TEXTURE_ARGB_SRC,
    48     GLES2_SHADER_FRAGMENT_TEXTURE_BGR_SRC,
    49     GLES2_SHADER_FRAGMENT_TEXTURE_RGB_SRC,
    50     GLES2_SHADER_FRAGMENT_TEXTURE_YUV_SRC,
    51     GLES2_SHADER_FRAGMENT_TEXTURE_NV12_SRC,
    52     GLES2_SHADER_FRAGMENT_TEXTURE_NV21_SRC
    53 } GLES2_ShaderType;
    54 
    55 #define GLES2_SOURCE_SHADER (GLenum)-1
    56 
    57 const GLES2_Shader *GLES2_GetShader(GLES2_ShaderType type, SDL_BlendMode blendMode);
    58 
    59 #endif /* SDL_shaderdata_h_ */
    60 
    61 #endif /* SDL_VIDEO_RENDER_OGL_ES2 */
    62 
    63 /* vi: set ts=4 sw=4 expandtab: */