From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Thu, 21 Feb 2019 08:29:29 +0000 (+0900)
Subject: udev-rules: do not ignore short lines
X-Git-Tag: v242-rc1~259^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e8b2737f205d4238220dcab973e21b20a0640802;p=thirdparty%2Fsystemd.git

udev-rules: do not ignore short lines

Otherwise, a short line continues the previous continuation.

This fixes a bug introduced by f10aa08e3e48de7dcb71be348f021c6b1385304f.
---

diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c
index e34ecc6ee9c..178a41906ff 100644
--- a/src/udev/udev-rules.c
+++ b/src/udev/udev-rules.c
@@ -1496,8 +1496,6 @@ static int parse_file(UdevRules *rules, const char *filename) {
                         continue;
 
                 len = strlen(line);
-                if (len < 3)
-                        continue;
 
                 if (continuation && !ignore_line) {
                         if (strlen(continuation) + len >= UTIL_LINE_SIZE)
@@ -1512,7 +1510,7 @@ static int parse_file(UdevRules *rules, const char *filename) {
                         }
                 }
 
-                if (line[len - 1] == '\\') {
+                if (len > 0 && line[len - 1] == '\\') {
                         if (ignore_line)
                                 continue;
 
@@ -1528,7 +1526,7 @@ static int parse_file(UdevRules *rules, const char *filename) {
 
                 if (ignore_line)
                         log_error("Line too long '%s':%u, ignored", filename, line_nr);
-                else
+                else if (len > 0)
                         add_rule(rules, line, filename, filename_off, line_nr);
 
                 continuation = mfree(continuation);