From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Tue, 18 Jun 2024 09:12:39 +0000 (+0900)
Subject: strv: replace always-true condition with assertion
X-Git-Tag: v257-rc1~1107
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f2d2aa0934a07bd7f40cfe7304620a279cadb018;p=thirdparty%2Fsystemd.git

strv: replace always-true condition with assertion

Follow-up for aca093018c5d2cd8a63129cab67941fe1b8fd850.
Fixes CID#1547105.
---

diff --git a/src/basic/strv.c b/src/basic/strv.c
index 1ca5118eff8..6c71f990c83 100644
--- a/src/basic/strv.c
+++ b/src/basic/strv.c
@@ -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);