From 51e0e91115e54cb29aca515d2e920a67d1c7fca5 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 14 Feb 2011 11:30:11 -0500 Subject: [PATCH] Fix syslog string processing squash_string_nonprintable didn't actually modify the string. Reviewed-By: Colin Walters --- dbus/dbus-sysdeps-util-unix.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dbus/dbus-sysdeps-util-unix.c b/dbus/dbus-sysdeps-util-unix.c index 02954d5..ba8ca7f 100644 --- a/dbus/dbus-sysdeps-util-unix.c +++ b/dbus/dbus-sysdeps-util-unix.c @@ -1058,11 +1058,11 @@ string_squash_nonprintable (DBusString *str) for (i = 0; i < len; i++) { - unsigned char c = (unsigned char) buf[i]; + unsigned char c = (unsigned char) buf[i]; if (c == '\0') - c = ' '; + buf[i] = ' '; else if (c < 0x20 || c > 127) - c = '?'; + buf[i] = '?'; } } @@ -1132,10 +1132,10 @@ _dbus_command_for_pid (unsigned long pid, goto fail; string_squash_nonprintable (&cmdline); - + if (!_dbus_string_copy (&cmdline, 0, str, _dbus_string_get_length (str))) goto oom; - + _dbus_string_free (&cmdline); _dbus_string_free (&path); return TRUE; -- 2.7.4