diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-04-05 13:00:22 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-04-05 13:00:22 +0100 |
| commit | 3b1ad7f7c583fbb80c5a084c78b926ecaaca0aa9 (patch) | |
| tree | 08ea4ccea83326749159fa3eecceaebc40e23504 | |
| parent | 71fc71fe5552c8292564ea0662b30fd535d8565f (diff) | |
| parent | 540e5692e07d48fb41a4e977e0c9078fa19bd677 (diff) | |
| download | dbus-3b1ad7f7c583fbb80c5a084c78b926ecaaca0aa9.tar.gz | |
Merge branch 'dbus-1.6'
Conflicts:
NEWS
configure.ac
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | dbus/dbus-connection.c | 3 |
3 files changed, 7 insertions, 2 deletions
@@ -1,6 +1,10 @@ D-Bus 1.7.2 (UNRELEASED) == +• Diagnose incorrect use of dbus_connection_get_data() with negative slot + (i.e. before allocating the slot) rather than returning junk + (fd.o #63127, Dan Williams) + • Unix-specific: · Under systemd, log to syslog only, not stderr, avoiding duplication (fd.o #61399, #39987; Colin Walters, Dagobert Michelsen) diff --git a/configure.ac b/configure.ac index b6430c52..aff812e6 100644 --- a/configure.ac +++ b/configure.ac @@ -212,7 +212,7 @@ fi # or binaries. AC_DEFINE([GLIB_VERSION_MIN_REQUIRED], [GLIB_VERSION_2_26], [Ignore post-2.26 deprecations]) -AC_DEFINE([GLIB_VERSION_MAX_ALLOWED], [GLIB_VERSION_2_26], [Prevent post-2.26 APIs]) +AC_DEFINE([GLIB_VERSION_MAX_ALLOWED], [GLIB_VERSION_2_32], [Prevent post-2.32 APIs]) with_glib=yes diff --git a/dbus/dbus-connection.c b/dbus/dbus-connection.c index ee33b6cc..66315b3f 100644 --- a/dbus/dbus-connection.c +++ b/dbus/dbus-connection.c @@ -5974,7 +5974,8 @@ dbus_connection_get_data (DBusConnection *connection, void *res; _dbus_return_val_if_fail (connection != NULL, NULL); - + _dbus_return_val_if_fail (slot >= 0, NULL); + SLOTS_LOCK (connection); res = _dbus_data_slot_list_get (&slot_allocator, |