Fix realloc misusages

Author: AMDmi3

src/sdl-instead/game.c

@@ -272,6 +272,7 @@ int games_replace(const char *path, const char *dir)
 	int rc;
 	char *p;
 	struct game *g;
+	struct game *new_games;
 	if (!is_game(path, dir))
 		return -1;
 	g = game_lookup(dir);
@@ -291,9 +292,10 @@ int games_replace(const char *path, const char *dir)
 		games_sort();
 		return 0;
 	}
-	games = realloc(games, sizeof(struct game) * (1 + games_nr));
-	if (!games)
+	new_games = realloc(games, sizeof(struct game) * (1 + games_nr));
+	if (!new_games)
 		return -1;
+	games = new_games;
 	rc = games_add(path, dir);
 	if (!rc)
 		games_sort();
@@ -305,6 +307,7 @@ int games_lookup(const char *path)
 	int n = 0, i = 0;
 	DIR *d;
 	struct dirent *de;
+	struct game *new_games;
 
 	if (!path)
 		return 0;
@@ -326,7 +329,12 @@ int games_lookup(const char *path)
 	rewinddir(d);
 	if (!n)
 		goto out;
-	games = realloc(games, sizeof(struct game) * (n + games_nr));
+	new_games = realloc(games, sizeof(struct game) * (n + games_nr));
+	if (!new_games) {
+		closedir(d);
+		return -1;
+	}
+	games = new_games;
 	while ((de = readdir(d)) && i < n) {
 		/*if (de->d_type != DT_DIR)
 			continue;*/
@@ -346,11 +354,14 @@ int games_lookup(const char *path)
 int games_remove(int gtr)
 {
 	int rc;
+	struct game *new_games;
 	rc = remove_dir(games[gtr].path);
 	free(games[gtr].name); free(games[gtr].dir); free(games[gtr].path);
 	games_nr --;
 	memmove(&games[gtr], &games[gtr + 1], (games_nr - gtr) * sizeof(struct game));
-	games = realloc(games, games_nr * sizeof(struct game));
+	new_games = realloc(games, games_nr * sizeof(struct game));
+	if (new_games) /* failure to shrink otherwise, and it's non-fatal */
+		games = new_games;
 	return rc;
 }
 

src/sdl-instead/graphics.c

@@ -1361,6 +1361,7 @@ static SDL_Rect **SDL_ListModes(const SDL_PixelFormat * format, Uint32 flags)
 	SDL_DisplayMode mode;    
 	int i, nmodes;
 	SDL_Rect **modes;
+	SDL_Rect **new_modes;
 	Uint32 Rmask, Gmask, Bmask, Amask;
 	int bpp;
 
@@ -1387,10 +1388,11 @@ static SDL_Rect **SDL_ListModes(const SDL_PixelFormat * format, Uint32 flags)
 			&& modes[nmodes - 1]->h == mode.h) {
 			continue;
 		}
-		modes = SDL_realloc(modes, (nmodes + 2) * sizeof(*modes));
-		if (!modes) {
+		new_modes = SDL_realloc(modes, (nmodes + 2) * sizeof(*modes));
+		if (!new_modes) {
 			return NULL;
 		}
+		modes = new_modes;
 		modes[nmodes] = (SDL_Rect *) SDL_malloc(sizeof(SDL_Rect));
 		if (!modes[nmodes]) {
 			return NULL;
@@ -2657,11 +2659,19 @@ struct xref *xref_new(char *link)
 	return p;
 }
 
-void xref_add_word(struct xref *xref, struct word *word)
+int xref_add_word(struct xref *xref, struct word *word)
 {
-	xref->words = realloc(xref->words, (xref->num + 1) * sizeof(struct word*));
+	struct word **new_words;
+
+	new_words = realloc(xref->words, (xref->num + 1) * sizeof(struct word*));
+	if (!new_words)
+		return -1;
+
+	xref->words = new_words;
 	xref->words[xref->num ++] = word;
 	word->xref = xref;
+
+	return 0;
 }
 
 void xref_free(struct xref *xref)

src/sdl-instead/menu.c

@@ -860,6 +860,7 @@ int menu_langs_lookup(const char *path)
 	int n = 0, i = 0;
 	DIR *d;
 	struct dirent *de;
+	struct lang *new_langs;
 
 	if (!path)
 		return 0;
@@ -877,7 +878,12 @@ int menu_langs_lookup(const char *path)
 	if (!n)
 		goto out;
 
-	langs = realloc(langs, sizeof(struct lang) * (n + langs_nr));
+	new_langs = realloc(langs, sizeof(struct lang) * (n + langs_nr));
+	if (!new_langs) {
+		closedir(d);
+		return -1;
+	}
+	langs = new_langs;
 
 	while ((de = readdir(d)) && i < n) {
 		if (!is_lang(path, de->d_name))

src/sdl-instead/themes.c

@@ -931,6 +931,7 @@ int themes_lookup(const char *path)
 	int n = 0, i = 0;
 	DIR *d;
 	struct dirent *de;
+	struct theme *new_themes;
 
 	if (!path)
 		return 0;
@@ -949,7 +950,12 @@ int themes_lookup(const char *path)
 	rewinddir(d);
 	if (!n)
 		goto out;
-	themes = realloc(themes, sizeof(struct theme) * (n + themes_nr));
+	new_themes = realloc(themes, sizeof(struct theme) * (n + themes_nr));
+	if (!new_themes) {
+		closedir(d);
+		return -1;
+	}
+	themes = new_themes;
 	while ((de = readdir(d)) && i < n) {
 		/*if (de->d_type != DT_DIR)
 			continue;*/