mirror of
https://gitlab.freedesktop.org/dbus/dbus.git
synced 2026-05-04 16:28:04 +02:00
Merge branch 'dbus-1.10'
This commit is contained in:
commit
561e39e2c8
2 changed files with 8 additions and 1 deletions
3
NEWS
3
NEWS
|
|
@ -17,6 +17,9 @@ Enhancements:
|
|||
|
||||
Fixes:
|
||||
|
||||
• Avoid undefined behaviour when setting reply serial number without going
|
||||
via union DBusBasicValue (fd.o #98035, Marc Mutz)
|
||||
|
||||
• Fix CMake build for Unix platforms that do not have -lrt, such as Android,
|
||||
or that do need -lsocket, such as QNX (fd.o #94096, Ralf Habacker)
|
||||
|
||||
|
|
|
|||
|
|
@ -1166,14 +1166,18 @@ dbus_bool_t
|
|||
dbus_message_set_reply_serial (DBusMessage *message,
|
||||
dbus_uint32_t reply_serial)
|
||||
{
|
||||
DBusBasicValue value;
|
||||
|
||||
_dbus_return_val_if_fail (message != NULL, FALSE);
|
||||
_dbus_return_val_if_fail (!message->locked, FALSE);
|
||||
_dbus_return_val_if_fail (reply_serial != 0, FALSE); /* 0 is invalid */
|
||||
|
||||
value.u32 = reply_serial;
|
||||
|
||||
return _dbus_header_set_field_basic (&message->header,
|
||||
DBUS_HEADER_FIELD_REPLY_SERIAL,
|
||||
DBUS_TYPE_UINT32,
|
||||
&reply_serial);
|
||||
&value);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue