diff options
| author | Andy Whitcroft <apw@shadowen.org> | 2008-10-16 07:02:26 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-16 20:21:36 +0200 |
| commit | 81bc0e020232a1e1e7010376382bb59ca82927ac (patch) | |
| tree | 2b2efb18efca7c9a17d4e1f32d40f94f95101d57 /scripts/checkpatch.pl | |
| parent | checkpatch: suppress errors triggered by short patch (diff) | |
| download | linux-81bc0e020232a1e1e7010376382bb59ca82927ac.tar.xz linux-81bc0e020232a1e1e7010376382bb59ca82927ac.zip | |
checkpatch: handle comment/quote nesting correctly
Ensure that a close comment cannot incorrectly trigger in the middle of a
string. Reported by Jaswinder Singh.
Signed-off-by: Andy Whitcroft <apw@shadowen.org>
Cc: Jaswinder Singh <jaswinder@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'scripts/checkpatch.pl')
| -rwxr-xr-x | scripts/checkpatch.pl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index 5382f7287397..18646f076a84 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -335,7 +335,7 @@ sub sanitise_line { $off++; next; } - if (substr($line, $off, 2) eq '*/') { + if ($sanitise_quote eq '*/' && substr($line, $off, 2) eq '*/') { $sanitise_quote = ''; substr($res, $off, 2, "$;$;"); $off++; |