From 3f57a7f93b3e7550cbd73036f6a56654e17d1d5c Mon Sep 17 00:00:00 2001 From: tnut Date: Sun, 8 Jan 2012 12:15:45 +0100 Subject: split de git pakxe et NuTyX-extra --- wpa_supplicant/dbus-null-error.patch | 47 ++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 wpa_supplicant/dbus-null-error.patch (limited to 'wpa_supplicant/dbus-null-error.patch') diff --git a/wpa_supplicant/dbus-null-error.patch b/wpa_supplicant/dbus-null-error.patch new file mode 100644 index 000000000..5ca070d3d --- /dev/null +++ b/wpa_supplicant/dbus-null-error.patch @@ -0,0 +1,47 @@ +commit 8ee69e06336d65b15364f4db82d91775d0fe47c6 +Author: Paul Stewart +Date: Sat Oct 9 17:29:51 2010 +0300 + + dbus_new_handlers: Don't send NULL to dbus_message_new_error + + The new DBus API helper function wpas_dbus_error_unknown_error + function can be called as a result of a failure within internal + getter calls, which will call this function with a NULL message + parameter. However, dbus_message_new_error looks very unkindly + (i.e, abort()) on a NULL message, so in this case, we should not + call it. + + I've observed this course of events during a call to + wpas_dbus_getter_bss_wpa with a faileld parse of the IE parameter. + We got here through a call to fill_dict_with_properties which + explicitly calls getters with a NULL message parameter. Judging + from the way it is called, this could easily occur if an AP sends + out a malformed (or mis-received) probe response. I usually run + into this problem while driving through San Francisco, so I'm + exposed to any number of base stations along this path. + +Index: wpa_supplicant/dbus/dbus_new_handlers.c +=================================================================== +--- a/wpa_supplicant/dbus/dbus_new_handlers.c ++++ b/wpa_supplicant/dbus/dbus_new_handlers.c 2011-06-19 22:42:06.912577474 -0300 +@@ -117,6 +117,20 @@ + DBusMessage * wpas_dbus_error_unknown_error(DBusMessage *message, + const char *arg) + { ++ /* ++ * This function can be called as a result of a failure ++ * within internal getter calls, which will call this function ++ * with a NULL message parameter. However, dbus_message_new_error ++ * looks very unkindly (i.e, abort()) on a NULL message, so ++ * in this case, we should not call it. ++ */ ++ if (message == NULL) { ++ wpa_printf(MSG_INFO, "dbus: wpas_dbus_error_unknown_error " ++ "called with NULL message (arg=%s)", ++ arg ? arg : "N/A"); ++ return NULL; ++ } ++ + return dbus_message_new_error(message, WPAS_DBUS_ERROR_UNKNOWN_ERROR, + arg); + } -- cgit v1.2.3-70-g09d2