Merge pull request #6902 from keszybz/two-property-printing-fixes

Two property printing fixes
2017-09-26 18:09:23 +02:00
parent 0cde65e263 c533658a1c
commit dc4a5b4b06
3 changed files with 31 additions and 4 deletions
@@ -86,15 +86,17 @@ int capability_set_to_string_alloc(uint64_t set, char **s) {

                        add = strlen(p);

-                        if (!GREEDY_REALLOC0(str, allocated, n + add + 2))
+                        if (!GREEDY_REALLOC(str, allocated, n + add + 2))
                                return -ENOMEM;

                        strcpy(mempcpy(str + n, p, add), " ");
                        n += add + 1;
                }

-        if (n != 0)
-                str[n - 1] = '\0';
+        if (!GREEDY_REALLOC(str, allocated, n + 1))
+                return -ENOMEM;
+
+        str[n > 0 ? n - 1 : 0] = '\0'; /* truncate the last space, if it's there */

        *s = str;
        str = NULL;