dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r15568) -Cleanup: *allocT/AllocaM doesn't return NULL when allocating fails

Browse Source
This commit is contained in:
smatz
2009-02-24 20:59:17 +00:00
parent 471c770a08
commit 34bfb35105
10 changed files with 5 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/fileio.cpp
View File

@@ -991,20 +991,17 @@ void SanitizeFilename(char *filename)
void *ReadFileToMem(const char *filename, size_t *lenp, size_t maxsize)
{
FILE *in;
byte *mem;
size_t len;
in = fopen(filename, "rb");
FILE *in = fopen(filename, "rb");
if (in == NULL) return NULL;
fseek(in, 0, SEEK_END);
len = ftell(in);
size_t len = ftell(in);
fseek(in, 0, SEEK_SET);
if (len > maxsize || (mem = MallocT<byte>(len + 1)) == NULL) {
if (len > maxsize) {
fclose(in);
return NULL;
}
byte *mem = MallocT<byte>(len + 1);
mem[len] = 0;
if (fread(mem, len, 1, in) != 1) {
fclose(in);