Attachment 80387 Details for Bug 65424 – [PATCH v2] dbus-send: check usage a bit strictly

[patch] [PATCH v2] dbus-send: check usage a bit strictly

0001-dbus-send-check-usage-a-bit-strictly.patch (text/plain), 3.13 KB, created by Chengwei Yang on 2013-06-06 09:15:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chengwei Yang

Created: 2013-06-06 09:15:43 UTC

Size: 3.13 KB

patch

obsolete

>From ee9475eadb0530d9c12e7759ffd1d368b3ddb49e Mon Sep 17 00:00:00 2001
>From: Chengwei Yang <chengwei.yang@intel.com>
>Date: Thu, 6 Jun 2013 16:58:11 +0800
>Subject: [PATCH v2] dbus-send: check usage a bit strictly
>
>This commit does several more strictly check for dbus-send as its usage
>suggested.
>
>* now --address is an invalid option but --address=, this just like the
>  others, say --reply-timeout=, --dest=, --type=
>* --print-reply= only take an optional argument "=literal"
>* --print-reply= will cause error with missing MSEC and invalid MSEC
>  will cause invalid value error
>* --dest= will cause error with missing a NAME and also call
>  dbus_validate_bus_name to verify the NAME
>
>Signed-off-by: Chengwei Yang <chengwei.yang@intel.com>
>---
> tools/dbus-send.c |   44 ++++++++++++++++++++++++++++++++++----------
> 1 file changed, 34 insertions(+), 10 deletions(-)
>
>diff --git a/tools/dbus-send.c b/tools/dbus-send.c
>index e403a58..ca5dd5c 100644
>--- a/tools/dbus-send.c
>+++ b/tools/dbus-send.c
>@@ -266,34 +266,52 @@ main (int argc, char *argv[])
> 	  type = DBUS_BUS_SESSION;
>           session_or_system = TRUE;
>         }
>-      else if (strstr (arg, "--address") == arg)
>+      else if (strstr (arg, "--address=") == arg)
>         {
>-          address = strchr (arg, '=');
>-
>-          if (address == NULL) 
>+          if (*(strchr (arg, '=') + 1) == '\0')
>             {
>               fprintf (stderr, "\"--address=\" requires an ADDRESS\n");
>               usage (1);
>             }
>-          else
>-            {
>-              address = address + 1;
>-            }
>+          address = strchr (arg, '=') + 1;
>         }
>       else if (strncmp (arg, "--print-reply", 13) == 0)
> 	{
> 	  print_reply = TRUE;
> 	  message_type = DBUS_MESSAGE_TYPE_METHOD_CALL;
>-	  if (*(arg + 13) != '\0')
>+	  if (strcmp (arg + 13, "=literal") == 0)
> 	    print_reply_literal = TRUE;
>+	  else if (*(arg + 13) != '\0')
>+	    {
>+	      fprintf (stderr, "invalid value (%s) of \"--print-reply\"\n", arg + 13);
>+	      usage (1);
>+	    }
> 	}
>       else if (strstr (arg, "--reply-timeout=") == arg)
> 	{
>+	  if (*(strchr (arg, '=') + 1) == '\0')
>+	    {
>+	      fprintf (stderr, "\"--reply-timeout=\" requires an MSEC\n");
>+	      usage (1);
>+	    }
> 	  reply_timeout = strtol (strchr (arg, '=') + 1,
> 				  NULL, 10);
>+	  if (reply_timeout <= 0)
>+	    {
>+	      fprintf (stderr, "invalid value (%s) of \"--reply-timeout\"\n",
>+	               strchr (arg, '=') + 1);
>+	      usage (1);
>+	    }
> 	}
>       else if (strstr (arg, "--dest=") == arg)
>-	dest = strchr (arg, '=') + 1;
>+	{
>+	  if (*(strchr (arg, '=') + 1) == '\0')
>+	    {
>+	      fprintf (stderr, "\"--dest=\" requires an NAME\n");
>+	      usage (1);
>+	    }
>+	  dest = strchr (arg, '=') + 1;
>+	}
>       else if (strstr (arg, "--type=") == arg)
> 	type_str = strchr (arg, '=') + 1;
>       else if (!strcmp(arg, "--help"))
>@@ -330,6 +348,12 @@ main (int argc, char *argv[])
>   
>   dbus_error_init (&error);
> 
>+  if (!dbus_validate_bus_name (dest, &error))
>+    {
>+      fprintf (stderr, "invalid value (%s) of \"--dest\"\n", dest);
>+      usage (1);
>+    }
>+
>   if (address != NULL)
>     {
>       connection = dbus_connection_open (address, &error);
>-- 
>1.7.9.5
>

Actions: View | Splinter Review

Attachments on bug 65424: 80354 | 80355 | 80385 | 80387

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.