From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Tue, 18 Jan 2011 16:34:12 +0000 (+0000)
Subject: handle_server_data_anonymous_mech: remove unnecessary debug output
X-Git-Tag: dbus-1.4.10~17
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=42297fb4e4ac28c67b6a531da2368ef2b2b7c224;p=platform%2Fupstream%2Fdbus.git

handle_server_data_anonymous_mech: remove unnecessary debug output

Doing a malloc and a hex-encoding pass just to produce a _dbus_verbose
message (i.e. a message that, in practice, nobody will see) seems like
overkill, and this block had incorrect error handling (not checking the
result of _dbus_string_init) which upsets static analysis tools.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=29881
Bug-NB: NB#180486
Reviewed-by: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
---

diff --git a/dbus/dbus-auth.c b/dbus/dbus-auth.c
index 3173f34..270d85e 100644
--- a/dbus/dbus-auth.c
+++ b/dbus/dbus-auth.c
@@ -1202,18 +1202,6 @@ handle_server_data_anonymous_mech (DBusAuth         *auth,
         {
           _dbus_verbose ("%s: Received invalid UTF-8 trace data from ANONYMOUS client\n",
                          DBUS_AUTH_NAME (auth));
-
-          {
-            DBusString plaintext;
-            DBusString encoded;
-            _dbus_string_init_const (&plaintext, "D-Bus " DBUS_VERSION_STRING);
-            _dbus_string_init (&encoded);
-            _dbus_string_hex_encode (&plaintext, 0,
-                                     &encoded,
-                                     0);
-              _dbus_verbose ("%s: try '%s'\n",
-                             DBUS_AUTH_NAME (auth), _dbus_string_get_const_data (&encoded));
-          }
           return send_rejected (auth);
         }