Skip to content
Permalink
Browse files

Reverted most of r3200:3201: a malloc() failure would leave a zero-byte

 file if opening for write.
  • Loading branch information
icculus committed Jul 10, 2007
1 parent b9db520 commit f95cf1356f92334fae05d9519017c414a62016ca
Showing with 15 additions and 9 deletions.
  1. +15 −9 src/file/SDL_rwops.c
@@ -57,6 +57,11 @@ static int SDLCALL win32_file_open(SDL_RWops *context, const char *filename, con

if (!context)
return -1; /* failed (invalid call) */

context->hidden.win32io.h = INVALID_HANDLE_VALUE; /* mark this as unusable */
context->hidden.win32io.buffer.data = NULL;
context->hidden.win32io.buffer.size = 0;
context->hidden.win32io.buffer.left = 0;

/* "r" = reading, file must exist */
/* "w" = writing, truncate existing, file may not exist */
@@ -74,6 +79,12 @@ static int SDLCALL win32_file_open(SDL_RWops *context, const char *filename, con
if (!r_right && !w_right) /* inconsistent mode */
return -1; /* failed (invalid call) */

context->hidden.win32io.buffer.data = (char *)SDL_malloc(READAHEAD_BUFFER_SIZE);
if (!context->hidden.win32io.buffer.data) {
SDL_OutOfMemory();
return -1;
}

#ifdef _WIN32_WCE
{
size_t size = SDL_strlen(filename)+1;
@@ -82,6 +93,8 @@ static int SDLCALL win32_file_open(SDL_RWops *context, const char *filename, con
if ( MultiByteToWideChar(CP_UTF8, 0, filename, -1, filenameW, size) == 0 ) {
SDL_SetError("Unable to convert filename to Unicode");
SDL_stack_free(filenameW);
SDL_free(context->hidden.win32io.buffer.data);
context->hidden.win32io.buffer.data = NULL;
return -1;
}
h = CreateFile(filenameW, (w_right|r_right), (w_right)? 0 : FILE_SHARE_READ,
@@ -101,20 +114,13 @@ static int SDLCALL win32_file_open(SDL_RWops *context, const char *filename, con

if (h==INVALID_HANDLE_VALUE) {
SDL_SetError("Couldn't open %s",filename);
SDL_free(context->hidden.win32io.buffer.data);
context->hidden.win32io.buffer.data = NULL;
return -2; /* failed (CreateFile) */
}
context->hidden.win32io.h = h;
context->hidden.win32io.append = a_mode;

context->hidden.win32io.buffer.data = (char *)SDL_malloc(READAHEAD_BUFFER_SIZE);
if (!context->hidden.win32io.buffer.data) {
SDL_OutOfMemory();
CloseHandle(context->hidden.win32io.h);
return -1;
}
context->hidden.win32io.buffer.size = 0;
context->hidden.win32io.buffer.left = 0;

return 0; /* ok */
}
static int SDLCALL win32_file_seek(SDL_RWops *context, int offset, int whence)

0 comments on commit f95cf13

Please sign in to comment.