fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-05-07 13:18:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'keyring-undefined-shift' into 'master'

Browse source 
keyring: Avoid undefined out-of-range shift

See merge request dbus/dbus!45
This commit is contained in:
Simon McVittie 2018-11-20 11:22:20 +00:00
commit 2b229d0471
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
dbus/dbus-keyring.c
View file

@ -310,9 +310,7 @@ add_new_key (DBusKey **keys_p,
s = (const unsigned char*) _dbus_string_get_const_data (&bytes);
id = s[0] | (s[1] << 8) | (s[2] << 16) | (s[3] << 24);
if (id < 0)
id = - id;
id = s[0] | (s[1] << 8) | (s[2] << 16) | ((s[3] & 0x7f) << 24);
_dbus_assert (id >= 0);
if (find_key_by_id (keys, n_keys, id) != NULL)