Fix checks when allocating/creating media

simple2d · Mar 4, 2019 · 365bbb7 · 365bbb7
1 parent 22c03ec
commit 365bbb7
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/src/image.c b/src/image.c
@@ -18,14 +18,15 @@ S2D_Image *S2D_CreateImage(const char *path) {
   // Allocate the image structure
   S2D_Image *img = (S2D_Image *) malloc(sizeof(S2D_Image));
   if (!img) {
-    S2D_Error("IMG_Load", "Out of memory!");
+    S2D_Error("S2D_CreateImage", "Out of memory!");
     return NULL;
   }
 
   // Load image from file as SDL_Surface
   img->surface = IMG_Load(path);
   if (!img->surface) {
     S2D_Error("IMG_Load", IMG_GetError());
+    free(img);
     return NULL;
   }
 

diff --git a/src/sound.c b/src/sound.c
@@ -17,6 +17,10 @@ S2D_Sound *S2D_CreateSound(const char *path) {
 
   // Allocate the sound structure
   S2D_Sound *snd = (S2D_Sound *) malloc(sizeof(S2D_Sound));
+  if (!snd) {
+    S2D_Error("S2D_CreateSound", "Out of memory!");
+    return NULL;
+  }
 
   // Load the sound data from file
   snd->data = Mix_LoadWAV(path);

diff --git a/src/sprite.c b/src/sprite.c
@@ -14,9 +14,20 @@ S2D_Sprite *S2D_CreateSprite(const char *path) {
     return NULL;
   }
 
-  // Allocate the sprite structure and create the image
+  // Allocate the sprite structure
   S2D_Sprite *spr = (S2D_Sprite *) malloc(sizeof(S2D_Sprite));
+  if (!spr) {
+    S2D_Error("S2D_CreateSprite", "Out of memory!");
+    return NULL;
+  }
+
+  // Load the sprite image file
   spr->img = S2D_CreateImage(path);
+  if (!spr->img) {
+    S2D_Error("S2D_CreateSprite", "Cannot create sprite image `%s`", path);
+    free(spr);
+    return NULL;
+  }
 
   // Initialize values
   spr->path = path;