sergiotarxz/termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cgdb: add patch to disable fdsan

Browse Source 
Similar to patch for texlive-bin, inetutils, emacs and zsh. Cast from
void to function pointer had to be modified though, , or else we get a
compilation error:

cgdb.cpp:1770:12: error: cannot initialize a variable of type 'void (*)(enum android_fdsan_error_level)' with an rvalue of type 'void *'
    void (*set_fdsan_error_level)(enum android_fdsan_error_level newlevel) = dlsym(lib_handle, "android_fdsan_set_error_level");
           ^                                                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Not sure why we have not seen the same error for the other packages
with this patch.

Fixes https://github.com/termux/termux-packages/issues/7881.
This commit is contained in:
Henrik Grimler 2021-12-13 09:32:03 +01:00
parent 1bed36cd3f
commit 3abcd55aae
No known key found for this signature in database
GPG Key ID: B0076E490B71616B
2 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/cgdb/build.sh
View File

@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="A lightweight curses (terminal-based) interface to the G
TERMUX_PKG_LICENSE="GPL-2.0"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=0.7.1
TERMUX_PKG_REVISION=1
TERMUX_PKG_REVISION=2
TERMUX_PKG_SRCURL=https://cgdb.me/files/cgdb-${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=bb723be58ec68cb59a598b8e24a31d10ef31e0e9c277a4de07b2f457fe7de198
TERMUX_PKG_DEPENDS="libc++, ncurses, readline, gdb"

35
packages/cgdb/disable-fdsan.patch Normal file
View File

@ -0,0 +1,35 @@
--- ./cgdb/cgdb.cpp~ 2021-12-13 09:02:26.731050742 +0100
+++ ./cgdb/cgdb.cpp 2021-12-13 09:07:32.078899611 +0100
@@ -84,6 +84,11 @@
#include "rline.h"
#include "usage.h"
+#ifdef __ANDROID__
+#include <android/fdsan.h>
+#include <dlfcn.h>
+#endif
+
/* --------- */
/* Constants */
/* --------- */
@@ -1757,6 +1762,20 @@
{
parse_long_options(&argc, &argv);
+
+ #ifdef __ANDROID__
+ // For Android 11+.
+ void *lib_handle = dlopen("libc.so", RTLD_LAZY);
+ if (lib_handle) {
+ void (*set_fdsan_error_level)(enum android_fdsan_error_level);
+ set_fdsan_error_level = (void (*)(enum android_fdsan_error_level))dlsym(lib_handle, "android_fdsan_set_error_level");
+ if (set_fdsan_error_level) {
+ set_fdsan_error_level(ANDROID_FDSAN_ERROR_LEVEL_DISABLED);
+ }
+ dlclose(lib_handle);
+ }
+ #endif
+
/* Debugging helper - wait for debugger to attach to us before continuing */
if (wait_for_debugger_to_attach) {
if (cgdb_supports_debugger_attach_detection()) {