diff options
author | tnut <tnut at nutyx dot com> | 2012-01-08 12:15:45 +0100 |
---|---|---|
committer | tnut <tnut at nutyx dot com> | 2012-01-08 12:15:45 +0100 |
commit | 3f57a7f93b3e7550cbd73036f6a56654e17d1d5c (patch) | |
tree | 819b14ab0377fe2054fe59866669d904e9e0b4b5 /extra/wpa_supplicant/dbus-null-error.patch | |
parent | c9972ec7f32bf9d37388e853fe9bf633e242d05a (diff) | |
download | nutyx-extra-3f57a7f93b3e7550cbd73036f6a56654e17d1d5c.tar.gz nutyx-extra-3f57a7f93b3e7550cbd73036f6a56654e17d1d5c.tar.bz2 nutyx-extra-3f57a7f93b3e7550cbd73036f6a56654e17d1d5c.tar.xz nutyx-extra-3f57a7f93b3e7550cbd73036f6a56654e17d1d5c.zip |
split de git pakxe et NuTyX-extra
Diffstat (limited to 'extra/wpa_supplicant/dbus-null-error.patch')
-rw-r--r-- | extra/wpa_supplicant/dbus-null-error.patch | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/extra/wpa_supplicant/dbus-null-error.patch b/extra/wpa_supplicant/dbus-null-error.patch deleted file mode 100644 index 5ca070d3d..000000000 --- a/extra/wpa_supplicant/dbus-null-error.patch +++ /dev/null @@ -1,47 +0,0 @@ -commit 8ee69e06336d65b15364f4db82d91775d0fe47c6 -Author: Paul Stewart <pstew@google.com> -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); - } |