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

fix off by one error message (#13305)

Browse source 
This patch is based on the patch created by John (J5) Palmieri
<johnp@redhat.com> plus to fix array of string assignment.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=13305
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
This commit is contained in:
Chengwei Yang 2013-09-29 18:10:33 +08:00 • committed by Simon McVittie
parent ecd4262cbf
commit b430642bc2
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
dbus/dbus-message.c
View file

@ -800,7 +800,7 @@ _dbus_message_iter_get_args_valist (DBusMessageIter *iter,
va_list var_args)
{
DBusMessageRealIter *real = (DBusMessageRealIter *)iter;
int spec_type, msg_type, i;
int spec_type, msg_type, i, j;
dbus_bool_t retval;
_dbus_assert (_dbus_message_iter_check (real));
@ -936,30 +936,30 @@ _dbus_message_iter_get_args_valist (DBusMessageIter *iter,
/* Now go through and dup each string */
_dbus_type_reader_recurse (&real->u.reader, &array);
i = 0;
while (i < n_elements)
j = 0;
while (j < n_elements)
{
const char *s;
_dbus_type_reader_read_basic (&array,
(void *) &s);
str_array[i] = _dbus_strdup (s);
if (str_array[i] == NULL)
str_array[j] = _dbus_strdup (s);
if (str_array[j] == NULL)
{
dbus_free_string_array (str_array);
_DBUS_SET_OOM (error);
goto out;
}
++i;
++j;
if (!_dbus_type_reader_next (&array))
_dbus_assert (i == n_elements);
_dbus_assert (j == n_elements);
}
_dbus_assert (_dbus_type_reader_get_current_type (&array) == DBUS_TYPE_INVALID);
_dbus_assert (i == n_elements);
_dbus_assert (str_array[i] == NULL);
_dbus_assert (j == n_elements);
_dbus_assert (str_array[j] == NULL);
*str_array_p = str_array;
*n_elements_p = n_elements;
@ -986,7 +986,7 @@ _dbus_message_iter_get_args_valist (DBusMessageIter *iter,
if (!_dbus_type_reader_next (&real->u.reader) && spec_type != DBUS_TYPE_INVALID)
{
dbus_set_error (error, DBUS_ERROR_INVALID_ARGS,
"Message has only %d arguments, but more were expected", i);
"Message has only %d arguments, but more were expected", i + 1);
goto out;
}