Commit baaca141 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Prevent loading KDE plugins for Qt4

Since they cause crashes pretty much all the time (KDE bug #234484).

Fixes: LP#408719, Debian #580396.
parent 3e4262af
...@@ -280,6 +280,17 @@ int (*XSetIOErrorHandler (int (*handler) (Display *))) (Display *) ...@@ -280,6 +280,17 @@ int (*XSetIOErrorHandler (int (*handler) (Display *))) (Display *)
return CALL(XSetIOErrorHandler, handler); return CALL(XSetIOErrorHandler, handler);
} }
#endif #endif
/*** Buggy shared objects ***/
#include <string.h>
void *dlopen (const char *path, int flag)
{
if (strstr (path, "/gui_platform/libkde.so"))
return NULL; /* Oh no, not that one! */
return CALL(dlopen, path, flag);
}
#else #else
void vlc_enable_override (void) void vlc_enable_override (void)
{ {
......
...@@ -199,14 +199,5 @@ int main( int i_argc, const char *ppsz_argv[] ) ...@@ -199,14 +199,5 @@ int main( int i_argc, const char *ppsz_argv[] )
for (int i = 2; i < argc; i++) for (int i = 2; i < argc; i++)
LocaleFree (argv[i]); LocaleFree (argv[i]);
#ifdef RTLD_NOLOAD
/* Avoid crash in KIO scheduler cleanup. */
/* This is ugly, but we get way too many crash reports due to this. */
if (dlopen ("libkfilemodule.so", RTLD_LAZY|RTLD_LOCAL|RTLD_NOLOAD) != NULL)
{
fprintf (stderr, "KFile plugin present. Unclean shutdown!\n");
_exit (0);
}
#endif
return 0; return 0;
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment