]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
strv: replace always-true condition with assertion
authorYu Watanabe <watanabe.yu+github@gmail.com>
Tue, 18 Jun 2024 09:12:39 +0000 (18:12 +0900)
committerLuca Boccassi <luca.boccassi@gmail.com>
Tue, 18 Jun 2024 20:09:04 +0000 (21:09 +0100)
Follow-up for aca093018c5d2cd8a63129cab67941fe1b8fd850.
Fixes CID#1547105.

src/basic/strv.c

index 1ca5118eff8223c196ae3fda933c9401e998623b..6c71f990c8313e254d603aed02fdc242203b9d8e 100644 (file)
@@ -1053,20 +1053,20 @@ int strv_rebreak_lines(char **l, size_t width, char ***ret) {
                         }
                 }
 
-                if (start) { /* Process rest of the line */
-                        if (in_prefix) /* Never seen anything non-whitespace? Generate empty line! */
-                                r = strv_extend(&broken, "");
-                        else if (whitespace_begin && !whitespace_end) { /* Ends in whitespace? Chop it off! */
-                                _cleanup_free_ char *truncated = strndup(start, whitespace_begin - start);
-                                if (!truncated)
-                                        return -ENOMEM;
-
-                                r = strv_consume(&broken, TAKE_PTR(truncated));
-                        } else /* Otherwise use line as is */
-                                r = strv_extend(&broken, start);
-                        if (r < 0)
-                                return r;
-                }
+                /* Process rest of the line */
+                assert(start);
+                if (in_prefix) /* Never seen anything non-whitespace? Generate empty line! */
+                        r = strv_extend(&broken, "");
+                else if (whitespace_begin && !whitespace_end) { /* Ends in whitespace? Chop it off! */
+                        _cleanup_free_ char *truncated = strndup(start, whitespace_begin - start);
+                        if (!truncated)
+                                return -ENOMEM;
+
+                        r = strv_consume(&broken, TAKE_PTR(truncated));
+                } else /* Otherwise use line as is */
+                        r = strv_extend(&broken, start);
+                if (r < 0)
+                        return r;
         }
 
         *ret = TAKE_PTR(broken);