#ifdef HAVE_EXECINFO_H
# include <execinfo.h>
#endif
+#ifdef NDEBUG
+# undef HAVE_BACKTRACE
+#endif
static bool override = false;
va_list ap)
{
#ifdef HAVE_BACKTRACE
- const size_t framec = 8;
+ const size_t framec = 4;
void *framev[framec];
backtrace (framev, framec);
void *sym = dlsym (RTLD_NEXT, name);
if (sym == NULL)
{
- fprintf (stderr, "Cannot resolve symbol %s!\n", name);
+ fprintf (stderr, "Cannot resolve symbol %s: %s\n", name,
+ dlerror ());
abort ();
}
return sym;
}
+/*** Locales ***
+ * setlocale() is not thread-safe and has a tendency to crash other threads as
+ * quite many libc and libintl calls depend on the locale.
+ * Use uselocale() instead for thread-safety.
+ */
+#include <locale.h>
+
+char *setlocale (int cat, const char *locale)
+{
+ if (override && locale != NULL)
+ {
+ LOG("Blocked", "%d, \"%s\"", cat, locale);
+ return NULL;
+ }
+ return CALL(setlocale, cat, locale);
+}
+
+
+/*** Xlib ****/
+#ifdef HAVE_X11_XLIB_H
+# include <X11/Xlib.h>
+
+static pthread_mutex_t xlib_lock = PTHREAD_MUTEX_INITIALIZER;
+
+int (*XSetErrorHandler (int (*handler) (Display *, XErrorEvent *)))
+ (Display *, XErrorEvent *)
+{
+ if (override)
+ {
+ int (*ret) (Display *, XErrorEvent *);
+
+ pthread_mutex_lock (&xlib_lock);
+ LOG("Error", "%p", handler);
+ ret = CALL(XSetErrorHandler, handler);
+ pthread_mutex_unlock (&xlib_lock);
+ return ret;
+ }
+ return CALL(XSetErrorHandler, handler);
+}
+
+int (*XSetIOErrorHandler (int (*handler) (Display *))) (Display *)
+{
+ if (override)
+ {
+ int (*ret) (Display *);
+
+ pthread_mutex_lock (&xlib_lock);
+ LOG("Error", "%p", handler);
+ ret = CALL(XSetIOErrorHandler, handler);
+ pthread_mutex_unlock (&xlib_lock);
+ return ret;
+ }
+ return CALL(XSetIOErrorHandler, handler);
+}
+#endif
#else
-static void vlc_enable_override (void)
+void vlc_enable_override (void)
{
}
#endif