mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-07 13:23:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

(trans_stream_zlib.c) Try to prevent null pointer dereferences

Browse Source
This commit is contained in:
twinaphex 2017-09-30 01:41:09 +02:00
parent dc2664a4ef
commit f5dedd673f
2 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configuration.c
View File

@ -1302,7 +1302,7 @@ static struct config_float_setting *populate_settings_float(settings_t *settings
#endif #endif
#ifdef HAVE_MENU #ifdef HAVE_MENU
SETTING_FLOAT("menu_wallpaper_opacity", &settings->floats.menu_wallpaper_opacity, true, menu_wallpaper_opacity, false); SETTING_FLOAT("menu_wallpaper_opacity", &settings->floats.menu_wallpaper_opacity, true, menu_wallpaper_opacity, false);
SETTING_FLOAT("menu_framebuffer_opacity", &settings->floats.menu_framebuffer_opacity, true, menu_framebuffer_opacity, false); SETTING_FLOAT("menu_framebuffer_opacity", &settings->floats.menu_framebuffer_opacity, true, menu_framebuffer_opacity, false);
SETTING_FLOAT("menu_footer_opacity", &settings->floats.menu_footer_opacity, true, menu_footer_opacity, false); SETTING_FLOAT("menu_footer_opacity", &settings->floats.menu_footer_opacity, true, menu_footer_opacity, false);
SETTING_FLOAT("menu_header_opacity", &settings->floats.menu_header_opacity, true, menu_header_opacity, false); SETTING_FLOAT("menu_header_opacity", &settings->floats.menu_header_opacity, true, menu_header_opacity, false);
#endif #endif

42
libretro-common/streams/trans_stream_zlib.c
View File

@ -29,30 +29,34 @@
struct zlib_trans_stream struct zlib_trans_stream
{ {
z_stream z;
int ex; /* window_bits or level */
bool inited; bool inited;
int ex; /* window_bits or level */
z_stream z;
}; };
static void *zlib_deflate_stream_new(void) static void *zlib_deflate_stream_new(void)
{ {
struct zlib_trans_stream *ret = (struct zlib_trans_stream*)calloc(1, sizeof(struct zlib_trans_stream)); struct zlib_trans_stream *ret = (struct zlib_trans_stream*)calloc(1, sizeof(struct zlib_trans_stream));
if (ret) if (!ret)
ret->ex = 9; return NULL;
ret->ex = 9;
return (void *) ret; return (void *) ret;
} }
static void *zlib_inflate_stream_new(void) static void *zlib_inflate_stream_new(void)
{ {
struct zlib_trans_stream *ret = (struct zlib_trans_stream*)calloc(1, sizeof(struct zlib_trans_stream)); struct zlib_trans_stream *ret = (struct zlib_trans_stream*)calloc(1, sizeof(struct zlib_trans_stream));
if (ret) if (!ret)
ret->ex = MAX_WBITS; return NULL;
ret->ex = MAX_WBITS;
return (void *) ret; return (void *) ret;
} }
static void zlib_deflate_stream_free(void *data) static void zlib_deflate_stream_free(void *data)
{ {
struct zlib_trans_stream *z = (struct zlib_trans_stream *) data; struct zlib_trans_stream *z = (struct zlib_trans_stream *) data;
if (!z)
return;
if (z->inited) if (z->inited)
deflateEnd(&z->z); deflateEnd(&z->z);
free(z); free(z);
@ -73,7 +77,8 @@ static bool zlib_deflate_define(void *data, const char *prop, uint32_t val)
struct zlib_trans_stream *z = (struct zlib_trans_stream *) data; struct zlib_trans_stream *z = (struct zlib_trans_stream *) data;
if (string_is_equal_fast(prop, "level", 5)) if (string_is_equal_fast(prop, "level", 5))
{ {
z->ex = (int) val; if (z)
z->ex = (int) val;
return true; return true;
} }
return false; return false;
@ -84,7 +89,8 @@ static bool zlib_inflate_define(void *data, const char *prop, uint32_t val)
struct zlib_trans_stream *z = (struct zlib_trans_stream *) data; struct zlib_trans_stream *z = (struct zlib_trans_stream *) data;
if (string_is_equal_fast(prop, "window_bits", 11)) if (string_is_equal_fast(prop, "window_bits", 11))
{ {
z->ex = (int) val; if (z)
z->ex = (int) val;
return true; return true;
} }
return false; return false;
@ -139,11 +145,12 @@ static bool zlib_deflate_trans(
uint32_t *rd, uint32_t *wn, uint32_t *rd, uint32_t *wn,
enum trans_stream_error *error) enum trans_stream_error *error)
{ {
int zret; int zret = 0;
bool ret; bool ret = false;
uint32_t pre_avail_in, pre_avail_out; uint32_t pre_avail_in = 0;
uint32_t pre_avail_out = 0;
struct zlib_trans_stream *zt = (struct zlib_trans_stream *) data; struct zlib_trans_stream *zt = (struct zlib_trans_stream *) data;
z_stream *z = &zt->z; z_stream *z = &zt->z;
if (!zt->inited) if (!zt->inited)
{ {
@ -151,9 +158,9 @@ static bool zlib_deflate_trans(
zt->inited = true; zt->inited = true;
} }
pre_avail_in = z->avail_in; pre_avail_in = z->avail_in;
pre_avail_out = z->avail_out; pre_avail_out = z->avail_out;
zret = deflate(z, flush ? Z_FINISH : Z_NO_FLUSH); zret = deflate(z, flush ? Z_FINISH : Z_NO_FLUSH);
if (zret == Z_OK) if (zret == Z_OK)
{ {
@ -202,10 +209,11 @@ static bool zlib_inflate_trans(
enum trans_stream_error *error) enum trans_stream_error *error)
{ {
int zret; int zret;
bool ret; bool ret = false;
uint32_t pre_avail_in, pre_avail_out; uint32_t pre_avail_in = 0;
uint32_t pre_avail_out = 0;
struct zlib_trans_stream *zt = (struct zlib_trans_stream *) data; struct zlib_trans_stream *zt = (struct zlib_trans_stream *) data;
z_stream *z = &zt->z; z_stream *z = &zt->z;
if (!zt->inited) if (!zt->inited)
{ {