pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixes Android_JNI_FileRead behaviour where reading past the end of a file returns zero instead of the number of bytes read.

Browse source
This commit is contained in:
Gabriel Jacobo 2012-07-20 15:22:48 -03:00
parent 9a4128b20d
commit e4b5104b91
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/core/android/SDL_android.cpp
View file

@ -591,9 +591,13 @@ extern "C" size_t Android_JNI_FileRead(SDL_RWops* ctx, void* buffer,
size_t size, size_t maxnum) size_t size, size_t maxnum)
{ {
LocalReferenceHolder refs; 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; 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(); JNIEnv *mEnv = Android_JNI_GetEnv();
if (!refs.init(mEnv)) { if (!refs.init(mEnv)) {
return -1; return -1;