Attachment 86791 Details for Bug 13305 – [PATCH] fix off by one error message (#13305)

[patch] [PATCH] fix off by one error message (#13305)

0001-fix-off-by-one-error-message-13305.patch (text/plain), 2.92 KB, created by Chengwei Yang on 2013-09-29 10:18:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chengwei Yang

Created: 2013-09-29 10:18:26 UTC

Size: 2.92 KB

patch

obsolete

>From ce27b71088b4a79c84090199441d5bbf0f49195e Mon Sep 17 00:00:00 2001
>From: Chengwei Yang <chengwei.yang@intel.com>
>Date: Sun, 29 Sep 2013 18:10:33 +0800
>Subject: [PATCH] fix off by one error message (#13305)
>
>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
>---
> dbus/dbus-message.c |   20 ++++++++++----------
> 1 file changed, 10 insertions(+), 10 deletions(-)
>
>diff --git a/dbus/dbus-message.c b/dbus/dbus-message.c
>index 20c8be3..b6c1775 100644
>--- a/dbus/dbus-message.c
>+++ b/dbus/dbus-message.c
>@@ -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;
>         }
> 
>-- 
>1.7.9.5
>

Actions: View | Splinter Review

Attachments on bug 13305: 12630 | 12631 | 12653 | 86791

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.