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 with SDL_strrchr and without check "*(library_name + 1)"

12952.patch (text/plain), 1.27 KB, created by akk0rd87 on 2019-07-26 04:33:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: akk0rd87

Created: 2019-07-26 04:33:43 UTC

Size: 1.27 KB

patch

obsolete

># HG changeset patch
># User akk0rd87
># Date 1564075960 -10800
>#      Thu Jul 25 20:32:40 2019 +0300
># Node ID b0c7f0d0dd78b4f446811aa00eb52e589e96bb5d
># Parent  bc90ce38f1e27ace54b83bebf987993002504f7f
>Fixed bug 4739 - Uncompressed native libs may not extract from apk to filesystem. Loading main lib directly from apk.
>
>diff -r bc90ce38f1e2 -r b0c7f0d0dd78 src/core/android/SDL_android.c
>--- a/src/core/android/SDL_android.c	Tue Jul 23 14:41:00 2019 -0500
>+++ b/src/core/android/SDL_android.c	Thu Jul 25 20:32:40 2019 +0300
>@@ -629,6 +629,19 @@
> 
>     library_file = (*env)->GetStringUTFChars(env, library, NULL);
>     library_handle = dlopen(library_file, RTLD_GLOBAL);
>+
>+    if(!library_handle) {
>+        /* When deploying android app bundle format uncompressed native libs may not extract from apk to filesystem.
>+           In this case we should use lib name without path.
>+           https://bugzilla.libsdl.org/show_bug.cgi?id=4739
>+        */
>+        const char* library_name = SDL_strrchr(library_file, '/');
>+        if(library_name && (*library_name)) {
>+            library_name = library_name + 1;
>+            library_handle = dlopen(library_name, RTLD_GLOBAL);
>+        }
>+    }
>+
>     if (library_handle) {
>         const char *function_name;
>         SDL_main_func SDL_main;

Actions: View

Attachments on bug 4739: 3898 | 3899 | 3900

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.