summaryrefslogtreecommitdiff
path: root/dbus
diff options
context:
space:
mode:
authorJohannes Kauffmann <johanneskauffmann@hotmail.com>2022-08-18 12:26:26 +0000
committerJohannes Kauffmann <johanneskauffmann@hotmail.com>2022-08-18 12:34:24 +0000
commiteb195d70d0c9a0f2ce03b2450d5508d01f75cc96 (patch)
treefde276675093ce5bd33b094da46e982e812c9770 /dbus
parent7e0c51d8000a467a153700420a35a18d1b580c51 (diff)
downloaddbus-eb195d70d0c9a0f2ce03b2450d5508d01f75cc96.tar.gz
_dbus_message_iter_append_check: Fix ifdef check
With internal DBus checks disabled, but with assertions enabled, the function would be ifdef'ed out. This is problematic, since the function is called from within an assertion statement in _dbus_variant_write(). Fixes #412. Co-authored-by: Simon McVittie <smcv@collabora.com>
Diffstat (limited to 'dbus')
-rw-r--r--dbus/dbus-message.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/dbus/dbus-message.c b/dbus/dbus-message.c
index 19a43750..a87043e3 100644
--- a/dbus/dbus-message.c
+++ b/dbus/dbus-message.c
@@ -2675,7 +2675,7 @@ _dbus_message_iter_abandon_signature (DBusMessageRealIter *real)
dbus_free (str);
}
-#ifndef DBUS_DISABLE_CHECKS
+#if defined(DBUS_ENABLE_CHECKS) || defined(DBUS_ENABLE_ASSERT)
static dbus_bool_t
_dbus_message_iter_append_check (DBusMessageRealIter *iter)
{
@@ -2690,7 +2690,7 @@ _dbus_message_iter_append_check (DBusMessageRealIter *iter)
return TRUE;
}
-#endif /* DBUS_DISABLE_CHECKS */
+#endif
#ifdef HAVE_UNIX_FD_PASSING
static int *