We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] patch for RWFromFile() setting error on fallback on Android

SDL_RWFromFile_on_Android_error_set_on_fallback_patch.diff (text/plain), 3.74 KB, created by Philipp Wiesemann on 2013-04-01 07:38:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Philipp Wiesemann

Created: 2013-04-01 07:38:58 UTC

Size: 3.74 KB

patch

obsolete

>diff -r 7f22b9ba218f src/core/android/SDL_android.cpp
>--- a/src/core/android/SDL_android.cpp	Sun Mar 31 13:05:40 2013 -0400
>+++ b/src/core/android/SDL_android.cpp	Mon Apr 01 13:37:02 2013 +0200
>@@ -542,7 +542,8 @@
> }
> 
> // Test for an exception and call SDL_SetError with its detail if one occurs
>-static bool Android_JNI_ExceptionOccurred()
>+// If optional parameter silent is truthy then SDL_SetError() is not called.
>+static bool Android_JNI_ExceptionOccurred(bool silent = false)
> {
>     SDL_assert(LocalReferenceHolder::IsActive());
>     JNIEnv *mEnv = Android_JNI_GetEnv();
>@@ -554,27 +555,28 @@
>         // Until this happens most JNI operations have undefined behaviour
>         mEnv->ExceptionClear();
> 
>-        jclass exceptionClass = mEnv->GetObjectClass(exception);
>-        jclass classClass = mEnv->FindClass("java/lang/Class");
>+        if (!silent) {
>+            jclass exceptionClass = mEnv->GetObjectClass(exception);
>+            jclass classClass = mEnv->FindClass("java/lang/Class");
> 
>-        mid = mEnv->GetMethodID(classClass, "getName", "()Ljava/lang/String;");
>-        jstring exceptionName = (jstring)mEnv->CallObjectMethod(exceptionClass, mid);
>-        const char* exceptionNameUTF8 = mEnv->GetStringUTFChars(exceptionName, 0);
>+            mid = mEnv->GetMethodID(classClass, "getName", "()Ljava/lang/String;");
>+            jstring exceptionName = (jstring)mEnv->CallObjectMethod(exceptionClass, mid);
>+            const char* exceptionNameUTF8 = mEnv->GetStringUTFChars(exceptionName, 0);
> 
>-        mid = mEnv->GetMethodID(exceptionClass, "getMessage", "()Ljava/lang/String;");
>-        jstring exceptionMessage = (jstring)mEnv->CallObjectMethod(exception, mid);
>+            mid = mEnv->GetMethodID(exceptionClass, "getMessage", "()Ljava/lang/String;");
>+            jstring exceptionMessage = (jstring)mEnv->CallObjectMethod(exception, mid);
> 
>-        if (exceptionMessage != NULL) {
>-            const char* exceptionMessageUTF8 = mEnv->GetStringUTFChars(
>-                    exceptionMessage, 0);
>-            SDL_SetError("%s: %s", exceptionNameUTF8, exceptionMessageUTF8);
>-            mEnv->ReleaseStringUTFChars(exceptionMessage, exceptionMessageUTF8);
>-        } else {
>-            SDL_SetError("%s", exceptionNameUTF8);
>+            if (exceptionMessage != NULL) {
>+                const char* exceptionMessageUTF8 = mEnv->GetStringUTFChars(exceptionMessage, 0);
>+                SDL_SetError("%s: %s", exceptionNameUTF8, exceptionMessageUTF8);
>+                mEnv->ReleaseStringUTFChars(exceptionMessage, exceptionMessageUTF8);
>+            } else {
>+                SDL_SetError("%s", exceptionNameUTF8);
>+            }
>+
>+            mEnv->ReleaseStringUTFChars(exceptionName, exceptionNameUTF8);
>         }
> 
>-        mEnv->ReleaseStringUTFChars(exceptionName, exceptionNameUTF8);
>-
>         return true;
>     }
> 
>@@ -621,19 +623,19 @@
>     */
>     mid = mEnv->GetMethodID(mEnv->GetObjectClass(assetManager), "openFd", "(Ljava/lang/String;)Landroid/content/res/AssetFileDescriptor;");
>     inputStream = mEnv->CallObjectMethod(assetManager, mid, fileNameJString);
>-    if (Android_JNI_ExceptionOccurred()) {
>+    if (Android_JNI_ExceptionOccurred(true)) {
>         goto fallback;
>     }
> 
>     mid = mEnv->GetMethodID(mEnv->GetObjectClass(inputStream), "getStartOffset", "()J");
>     ctx->hidden.androidio.offset = mEnv->CallLongMethod(inputStream, mid);
>-    if (Android_JNI_ExceptionOccurred()) {
>+    if (Android_JNI_ExceptionOccurred(true)) {
>         goto fallback;
>     }
> 
>     mid = mEnv->GetMethodID(mEnv->GetObjectClass(inputStream), "getDeclaredLength", "()J");
>     ctx->hidden.androidio.size = mEnv->CallLongMethod(inputStream, mid);
>-    if (Android_JNI_ExceptionOccurred()) {
>+    if (Android_JNI_ExceptionOccurred(true)) {
>         goto fallback;
>     }
>

Actions: View | Diff

Attachments on bug 1780: 1094

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.