Merge pull request #6846 from keszybz/fix-udev_event_apply_format

Fix udev_event_apply_format()

src/core/dbus-execute.c

@@ -2150,7 +2150,7 @@ int bus_exec_context_set_transient_property(
 
                 m = exec_keyring_mode_from_string(s);
                 if (m < 0)
-                        return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid key ring mode");
+                        return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid keyring mode");
 
                 if (mode != UNIT_CHECK) {
                         c->keyring_mode = m;

src/core/execute.c

@@ -2270,7 +2270,7 @@ static int setup_keyring(
                         if (setregid(saved_gid, -1) < 0)
                                 return log_error_errno(errno, "Failed to change GID back for user keyring: %m");
                 }
-       }
+        }
 
         return 0;
 }

src/udev/udev-event.c

@@ -362,7 +362,7 @@ size_t udev_event_apply_format(struct udev_event *event,
                         }
 copy:
                         /* copy char */
-                        if (l == 0)
+                        if (l < 2) /* need space for this char and the terminating NUL */
                                 goto out;
                         s[0] = from[0];
                         from++;
@@ -377,12 +377,12 @@ subst:
                         unsigned int i;
 
                         from++;
-                        for (i = 0; from[i] != '}'; i++) {
+                        for (i = 0; from[i] != '}'; i++)
                                 if (from[i] == '\0') {
                                         log_error("missing closing brace for format '%s'", src);
                                         goto out;
                                 }
-                        }
+
                         if (i >= sizeof(attrbuf))
                                 goto out;
                         memcpy(attrbuf, from, i);
@@ -407,6 +407,7 @@ subst:
         }
 
 out:
+        assert(l >= 1);
         s[0] = '\0';
         return l;
 }