From: Dmitry V. Levin <ldv@strace.io>
Date: Sun, 19 Mar 2023 08:00:00 +0000 (+0000)
Subject: Revert "udev: prepare memory for extra NUL termination for NULSTR"
X-Git-Tag: v254-rc1~980^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8c499a61c46eb434db04d3ee4b116a0a755b3797;p=thirdparty%2Fsystemd.git

Revert "udev: prepare memory for extra NUL termination for NULSTR"

This reverts commit cd3c8a117ccf3505e49d34324473e2175ef0a9ce which was
papering over the bug instead of a proper fix made by the previous
commit.
---

diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c
index 71c09492202..a1c17a24e8c 100644
--- a/src/udev/udev-rules.c
+++ b/src/udev/udev-rules.c
@@ -1148,9 +1148,7 @@ static int rule_add_line(UdevRuleFile *rule_file, const char *line_str, unsigned
         if (isempty(line_str))
                 return 0;
 
-        /* We use memdup_suffix0() here, since we want to add a second NUL byte to the end, since possibly
-         * some parsers might turn this into a "nulstr", which requires an extra NUL at the end. */
-        line = memdup_suffix0(line_str, strlen(line_str) + 1);
+        line = strdup(line_str);
         if (!line)
                 return log_oom();