Fixed some realloc() mistakes that cppcheck discovered.

Fixes Bugzilla #1268. Thanks to Joshua Beck for the patch!
libsdl-org · Aug 25, 2011 · c33527f · c33527f
1 parent 51e5a59
commit c33527f
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/IMG_xpm.c b/IMG_xpm.c
@@ -123,8 +123,10 @@ static struct color_hash *create_colorhash(int maxnum)
 		return NULL;
 	memset(hash->table, 0, bytes);
 	hash->entries = malloc(maxnum * sizeof(struct hash_entry));
-	if(!hash->entries)
+	if(!hash->entries) {
+		free(hash->table);
 		return NULL;
+	}
 	hash->next_free = hash->entries;
 	return hash;
 }
@@ -259,11 +261,13 @@ static char *get_next_line(char ***lines, SDL_RWops *src, int len)
 			len += 4;	/* "\",\n\0" */
 			if(len > buflen){
 				buflen = len;
-				linebuf = realloc(linebuf, buflen);
-				if(!linebuf) {
+				char *linebufnew = realloc(linebuf, buflen);
+				if(!linebufnew) {
+					free(linebuf);
 					error = "Out of memory";
 					return NULL;
 				}
+				linebuf = linebufnew;
 			}
 			if(SDL_RWread(src, linebuf, len - 1, 1) <= 0) {
 				error = "Premature end of data";
@@ -277,11 +281,13 @@ static char *get_next_line(char ***lines, SDL_RWops *src, int len)
 					if(buflen == 0)
 						buflen = 16;
 					buflen *= 2;
-					linebuf = realloc(linebuf, buflen);
-					if(!linebuf) {
+					char *linebufnew = realloc(linebuf, buflen);
+					if(!linebufnew) {
+						free(linebuf);
 						error = "Out of memory";
 						return NULL;
 					}
+					linebuf = linebufnew;
 				}
 				if(SDL_RWread(src, linebuf + n, 1, 1) <= 0) {
 					error = "Premature end of data";