check line length after comment check and whitespace strip
This commit is contained in:
parent
b1ac36ff5e
commit
16511863d9
|
@ -111,11 +111,6 @@ static int parse_config_file(void)
|
|||
cur += count+1;
|
||||
lineno++;
|
||||
|
||||
if (count >= sizeof(line)) {
|
||||
err("line too long, conf line skipped %s, line %d", udev_config_filename, lineno);
|
||||
continue;
|
||||
}
|
||||
|
||||
/* eat the whitespace */
|
||||
while ((count > 0) && isspace(bufline[0])) {
|
||||
bufline++;
|
||||
|
@ -128,6 +123,11 @@ static int parse_config_file(void)
|
|||
if (bufline[0] == COMMENT_CHARACTER)
|
||||
continue;
|
||||
|
||||
if (count >= sizeof(line)) {
|
||||
err("line too long, conf line skipped %s, line %d", udev_config_filename, lineno);
|
||||
continue;
|
||||
}
|
||||
|
||||
memcpy(line, bufline, count);
|
||||
line[count] = '\0';
|
||||
|
||||
|
|
10
udev_rules.c
10
udev_rules.c
|
@ -349,11 +349,6 @@ static int import_keys_into_env(struct udevice *udev, const char *buf, size_t bu
|
|||
cur += count+1;
|
||||
lineno++;
|
||||
|
||||
if (count >= sizeof(line)) {
|
||||
err("line too long, conf line skipped %s, line %d", udev_config_filename, lineno);
|
||||
continue;
|
||||
}
|
||||
|
||||
/* eat the whitespace */
|
||||
while ((count > 0) && isspace(bufline[0])) {
|
||||
bufline++;
|
||||
|
@ -366,6 +361,11 @@ static int import_keys_into_env(struct udevice *udev, const char *buf, size_t bu
|
|||
if (bufline[0] == COMMENT_CHARACTER)
|
||||
continue;
|
||||
|
||||
if (count >= sizeof(line)) {
|
||||
err("line too long, conf line skipped %s, line %d", udev_config_filename, lineno);
|
||||
continue;
|
||||
}
|
||||
|
||||
memcpy(line, bufline, count);
|
||||
line[count] = '\0';
|
||||
|
||||
|
|
Loading…
Reference in a new issue