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

Fixes potential global reference leak on Android, by Philipp Wiesemann

Browse source
This commit is contained in:
Gabriel Jacobo 2013-01-27 21:43:20 -03:00
parent 02db40b1b2
commit 9e1dc0a80d
1 changed files with 1 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -593,7 +593,6 @@ static int Android_JNI_FileOpen(SDL_RWops* ctx)
goto fallback; goto fallback;
} }
ctx->hidden.androidio.assetFileDescriptorRef = mEnv->NewGlobalRef(inputStream);
mid = mEnv->GetMethodID(mEnv->GetObjectClass(inputStream), "getStartOffset", "()J"); mid = mEnv->GetMethodID(mEnv->GetObjectClass(inputStream), "getStartOffset", "()J");
ctx->hidden.androidio.offset = mEnv->CallLongMethod(inputStream, mid); ctx->hidden.androidio.offset = mEnv->CallLongMethod(inputStream, mid);
if (Android_JNI_ExceptionOccurred()) { if (Android_JNI_ExceptionOccurred()) {
@ -602,7 +601,6 @@ static int Android_JNI_FileOpen(SDL_RWops* ctx)
mid = mEnv->GetMethodID(mEnv->GetObjectClass(inputStream), "getDeclaredLength", "()J"); mid = mEnv->GetMethodID(mEnv->GetObjectClass(inputStream), "getDeclaredLength", "()J");
ctx->hidden.androidio.size = mEnv->CallLongMethod(inputStream, mid); ctx->hidden.androidio.size = mEnv->CallLongMethod(inputStream, mid);
if (Android_JNI_ExceptionOccurred()) { if (Android_JNI_ExceptionOccurred()) {
goto fallback; goto fallback;
} }
@ -612,6 +610,7 @@ static int Android_JNI_FileOpen(SDL_RWops* ctx)
fdCls = mEnv->GetObjectClass(fd); fdCls = mEnv->GetObjectClass(fd);
descriptor = mEnv->GetFieldID(fdCls, "descriptor", "I"); descriptor = mEnv->GetFieldID(fdCls, "descriptor", "I");
ctx->hidden.androidio.fd = mEnv->GetIntField(fd, descriptor); ctx->hidden.androidio.fd = mEnv->GetIntField(fd, descriptor);
ctx->hidden.androidio.assetFileDescriptorRef = mEnv->NewGlobalRef(inputStream);
// Seek to the correct offset in the file. // Seek to the correct offset in the file.
lseek(ctx->hidden.androidio.fd, (off_t)ctx->hidden.androidio.offset, SEEK_SET); lseek(ctx->hidden.androidio.fd, (off_t)ctx->hidden.androidio.offset, SEEK_SET);