Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

Fixes Android_JNI_FileRead behaviour where reading past the end of a …

…file returns zero instead of the number of bytes read.
  • Loading branch information
gabomdq committed Jul 20, 2012
1 parent 28b3ffe commit 46b306018a0eb402d449477d02aa3147133b8717
Showing with 5 additions and 1 deletion.
  1. +5 −1 src/core/android/SDL_android.cpp
@@ -591,9 +591,13 @@ extern "C" size_t Android_JNI_FileRead(SDL_RWops* ctx, void* buffer,
size_t size, size_t maxnum)
{
LocalReferenceHolder refs;
int bytesRemaining = size * maxnum;
jlong bytesRemaining = (jlong) (size * maxnum);
jlong bytesMax = (jlong) (ctx->hidden.androidio.size - ctx->hidden.androidio.position);
int bytesRead = 0;

/* Don't read more bytes than those that remain in the file, otherwise we get an exception */
if (bytesRemaining > bytesMax) bytesRemaining = bytesMax;

JNIEnv *mEnv = Android_JNI_GetEnv();
if (!refs.init(mEnv)) {
return -1;

0 comments on commit 46b3060

Please sign in to comment.