Attachment 49953 Details for Bug 34140 – dbus-spam: fix --random-size to not clobber argument parsing

[patch] dbus-spam: fix --random-size to not clobber argument parsing

dbus-spam-fix---random-size-to-not-clobber-argumen.patch (text/plain), 1.61 KB, created by Will Thompson on 2011-08-05 05:43:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Will Thompson

Created: 2011-08-05 05:43:28 UTC

Size: 1.61 KB

patch

obsolete

>From 58621a4ceff3ecf3c87a69450506f9eb30966bfc Mon Sep 17 00:00:00 2001
>From: Will Thompson <will.thompson@collabora.co.uk>
>Date: Fri, 5 Aug 2011 13:41:57 +0100
>Subject: [PATCH] dbus-spam: fix --random-size to not clobber argument parsing
>
>'i' is used to iterate across command-line arguments: unless there
>happen to be exactly the right number of body lengths, re-using it to
>iterate whitespace-separated integers from stdin is not going to work.
>:)
>---
> tools/dbus-spam.c |   10 +++++-----
> 1 files changed, 5 insertions(+), 5 deletions(-)
>
>diff --git a/tools/dbus-spam.c b/tools/dbus-spam.c
>index d680f12..b37478e 100644
>--- a/tools/dbus-spam.c
>+++ b/tools/dbus-spam.c
>@@ -201,7 +201,7 @@ dbus_test_tool_spam (int argc, char **argv)
>       else if (strcmp (arg, "--random-size") == 0)
>         {
>           unsigned int len, max = 0;
>-          int consumed = 0;
>+          int j, consumed = 0;
>           const char *p;
> 
>           consume_stdin (&payload_buf, &payload_len);
>@@ -220,12 +220,12 @@ dbus_test_tool_spam (int argc, char **argv)
>           if (random_sizes == NULL)
>             tool_oom ("allocating array of message lengths");
> 
>-          for (p = payload_buf, i = 0;
>-              p < payload_buf + payload_len && i < n_random_sizes;
>-              p += consumed, i++)
>+          for (p = payload_buf, j = 0;
>+              p < payload_buf + payload_len && j < n_random_sizes;
>+              p += consumed, j++)
>             {
>               sscanf (p, " %u %n", &len, &consumed);
>-              random_sizes[i] = len;
>+              random_sizes[j] = len;
> 
>               if (len > max)
>                 max = len;
>-- 
>1.7.5.4

Actions: View | Splinter Review

Attachments on bug 34140: 43349 | 43810 | 48295 | 48296 | 48297 | 49953 | 49954 | 51612 | 51613 | 51614 | 102143 | 102144 | 102145 | 107198 | 107199 | 107200

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.