Skip to content
Permalink
Browse files

Fixed SDL_AddHintCallback() crashing if no more memory available.

The return value of SDL_malloc() was not checked and NULL therefore not handled.
Also added setting of error message for the other SDL_malloc() in this function.
  • Loading branch information
philippwiesemann committed Oct 29, 2014
1 parent 2a46a9d commit 032b14e7b6667f6b6e1660c25c62dcb684b9cf93
Showing with 5 additions and 0 deletions.
  1. +5 −0 src/SDL_hints.c
@@ -137,6 +137,10 @@ SDL_AddHintCallback(const char *name, SDL_HintCallback callback, void *userdata)
SDL_DelHintCallback(name, callback, userdata);

entry = (SDL_HintWatch *)SDL_malloc(sizeof(*entry));
if (!entry) {
SDL_OutOfMemory();
return;
}
entry->callback = callback;
entry->userdata = userdata;

@@ -149,6 +153,7 @@ SDL_AddHintCallback(const char *name, SDL_HintCallback callback, void *userdata)
/* Need to add a hint entry for this watcher */
hint = (SDL_Hint *)SDL_malloc(sizeof(*hint));
if (!hint) {
SDL_OutOfMemory();
if(entry)
{
SDL_free(entry);

0 comments on commit 032b14e

Please sign in to comment.