chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
check line length after comment check and whitespace strip
[elogind.git]
/
udev_config.c
diff --git
a/udev_config.c
b/udev_config.c
index 3f226b9d7cd2f0e21a9ca3b1cdb56459dcbb37ff..2f2a69eb487a6fc1fc2e047df32ecc1bbee579ff 100644
(file)
--- a/
udev_config.c
+++ b/
udev_config.c
@@
-111,11
+111,6
@@
static int parse_config_file(void)
cur += count+1;
lineno++;
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++;
/* 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 (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';
memcpy(line, bufline, count);
line[count] = '\0';