diff -u udev-093/debian/changelog udev-093/debian/changelog --- udev-093/debian/changelog +++ udev-093/debian/changelog @@ -1,3 +1,9 @@ +udev (093-0ubuntu15) edgy; urgency=low + + * Check for comments before parsing rules. Closes lp #56317 + + -- Rocco Stanzione Sun, 10 Sep 2006 15:22:00 -0500 + udev (093-0ubuntu14) edgy; urgency=low * Be gone foul devfs-emulation fiends from hell! only in patch2: unchanged: --- udev-093.orig/udev_rules.c +++ udev-093/udev_rules.c @@ -164,6 +164,10 @@ cur += count+1; lineno++; + /* see if this is a comment */ + 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; @@ -177,10 +181,6 @@ if (count == 0) continue; - /* see if this is a comment */ - if (bufline[0] == COMMENT_CHARACTER) - continue; - memcpy(line, bufline, count); line[count] = '\0'; only in patch2: unchanged: --- udev-093.orig/udev_rules_parse.c +++ udev-093/udev_rules_parse.c @@ -609,6 +609,10 @@ cur += count+1; lineno++; + /* see if this is a comment */ + if (bufline[0] == COMMENT_CHARACTER) + continue; + if (count >= sizeof(line)) { err("line too long, rule skipped '%s:%u'", filename, lineno); continue; @@ -622,10 +626,6 @@ if (count == 0) continue; - /* see if this is a comment */ - if (bufline[0] == COMMENT_CHARACTER) - continue; - /* skip backslash and newline from multi line rules */ for (i = j = 0; i < count; i++) { if (bufline[i] == '\\' && bufline[i+1] == '\n')