mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

More robust track_design_open (#3573)

This commit is contained in:
Hielke Morsink 2016-05-12 13:46:57 +02:00 committed by Ted John
parent 755485f9b8
commit 9c95803643
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/ride/track_design.c
View File

@ -82,14 +82,14 @@ rct_track_td6 *track_design_open(const utf8 *path)
if (bufferLength < 4) { if (bufferLength < 4) {
log_error("Invalid track file: %s.", path); log_error("Invalid track file: %s.", path);
SDL_RWclose(file); SDL_RWclose(file);
return false; return NULL;
} }
uint8 *buffer = (uint8*)malloc(bufferLength); uint8 *buffer = (uint8*)malloc(bufferLength);
if (buffer == NULL) { if (buffer == NULL) {
log_error("Unable to allocate memory for track design file."); log_error("Unable to allocate memory for track design file.");
SDL_RWclose(file); SDL_RWclose(file);
return false; return NULL;
} }
SDL_RWread(file, buffer, bufferLength, 1); SDL_RWread(file, buffer, bufferLength, 1);
SDL_RWclose(file); SDL_RWclose(file);
@ -101,7 +101,7 @@ rct_track_td6 *track_design_open(const utf8 *path)
} }
// Decode the track data // Decode the track data
uint8 *decoded = malloc(0x10000); uint8 *decoded = (uint8*)malloc(0x10000);
size_t decodedLength = sawyercoding_decode_td6(buffer, decoded, bufferLength); size_t decodedLength = sawyercoding_decode_td6(buffer, decoded, bufferLength);
free(buffer); free(buffer);
decoded = realloc(decoded, decodedLength); decoded = realloc(decoded, decodedLength);
@ -111,8 +111,10 @@ rct_track_td6 *track_design_open(const utf8 *path)
rct_track_td6 *td6 = track_design_open_from_buffer(decoded, decodedLength); rct_track_td6 *td6 = track_design_open_from_buffer(decoded, decodedLength);
free(decoded); free(decoded);
td6->name = track_design_get_name_from_path(path); if (td6 != NULL) {
return td6; td6->name = track_design_get_name_from_path(path);
return td6;
}
} }
} }
return NULL; return NULL;