chiark / gitweb /
dbus-manager: fix tainted string
authorMichal Schmidt <mschmidt@redhat.com>
Wed, 9 May 2012 19:42:56 +0000 (21:42 +0200)
committerMichal Schmidt <mschmidt@redhat.com>
Wed, 9 May 2012 19:42:56 +0000 (21:42 +0200)
The pointer to the end of the string was not advanced after adding
the "cgroups-missing" taint. If "local-hwclock" was detected too,
it would overwrite the previous string.

With 'e' always pointing to the end of the string, removing the last
delimiter is easier.

src/core/dbus-manager.c

index 2e6bc3d..6ad1984 100644 (file)
@@ -310,13 +310,14 @@ static int bus_manager_append_tainted(DBusMessageIter *i, const char *property,
                 free(p);
 
         if (access("/proc/cgroups", F_OK) < 0)
-                stpcpy(e, "cgroups-missing:");
+                e = stpcpy(e, "cgroups-missing:");
 
         if (hwclock_is_localtime() > 0)
-                stpcpy(e, "local-hwclock:");
+                e = stpcpy(e, "local-hwclock:");
 
-        if (endswith(buf, ":"))
-                buf[strlen(buf)-1] = 0;
+        /* remove the last ':' */
+        if (e != buf)
+                e[-1] = 0;
 
         t = buf;