deepend/zoitechat
1
0
Fork 0
mirror of https://github.com/ZoiteChat/zoitechat.git synced 2026-03-10 07:50:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated Linux URL opening fallback in fe_open_url_inner to launch xdg-open with a sanitized environment instead of inheriting AppImage runtime linker vars. Specifically, LD_LIBRARY_PATH and LD_PRELOAD are removed before spawning, which prevents host /bin/sh and related tools from loading incompatible bundled libraries (the root cause of the rl_trim_arg_from_keyseq symbol error).

Browse Source 
Kept the existing behavior of trying gtk_show_uri first and only using xdg-open as fallback; this change only hardens the fallback path and preserves existing flow/logging.
This commit is contained in:
deepend
2026-02-24 20:13:48 -07:00
parent b7693e75ec
commit 4284cb76c1
1 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/fe-gtk/fe-gtk.c
View File

@@ -1683,6 +1683,7 @@ fe_open_url_inner (const char *url)
GError *error = NULL; GError *error = NULL;
char *escaped_url = maybe_escape_uri (url); char *escaped_url = maybe_escape_uri (url);
gchar *xdg_open_argv[] = {(gchar *) "xdg-open", escaped_url, NULL}; gchar *xdg_open_argv[] = {(gchar *) "xdg-open", escaped_url, NULL};
gchar **spawn_env = NULL;
g_debug ("Opening URL \"%s\" (%s)", escaped_url, url); g_debug ("Opening URL \"%s\" (%s)", escaped_url, url);
if (gtk_show_uri (NULL, escaped_url, GDK_CURRENT_TIME, &error)) if (gtk_show_uri (NULL, escaped_url, GDK_CURRENT_TIME, &error))
{ {
@@ -1693,9 +1694,22 @@ fe_open_url_inner (const char *url)
g_warning ("gtk_show_uri failed for '%s': %s", escaped_url, error ? error->message : "unknown error"); g_warning ("gtk_show_uri failed for '%s': %s", escaped_url, error ? error->message : "unknown error");
g_clear_error (&error); g_clear_error (&error);
/* AppImage runtime variables can point host binaries like /bin/sh at
* bundled libraries, which may not be ABI-compatible with system tools. */
spawn_env = g_get_environ ();
{
gchar **tmp_env = spawn_env;
spawn_env = g_environ_unsetenv (tmp_env, "LD_LIBRARY_PATH");
g_strfreev (tmp_env);
tmp_env = spawn_env;
spawn_env = g_environ_unsetenv (tmp_env, "LD_PRELOAD");
g_strfreev (tmp_env);
}
/* AppImage and sandboxed environments can fail to resolve URI handlers /* AppImage and sandboxed environments can fail to resolve URI handlers
* through GTK/GIO. Fall back to xdg-open when available. */ * through GTK/GIO. Fall back to xdg-open when available. */
if (!g_spawn_async (NULL, xdg_open_argv, NULL, if (!g_spawn_async (NULL, xdg_open_argv, spawn_env,
G_SPAWN_SEARCH_PATH | G_SPAWN_STDOUT_TO_DEV_NULL | G_SPAWN_STDERR_TO_DEV_NULL, G_SPAWN_SEARCH_PATH | G_SPAWN_STDOUT_TO_DEV_NULL | G_SPAWN_STDERR_TO_DEV_NULL,
NULL, NULL, NULL, &error)) NULL, NULL, NULL, &error))
{ {
@@ -1703,6 +1717,7 @@ fe_open_url_inner (const char *url)
g_clear_error (&error); g_clear_error (&error);
} }
g_strfreev (spawn_env);
g_free (escaped_url); g_free (escaped_url);
#endif #endif
} }