summaryrefslogtreecommitdiff
path: root/lib/coderay/scanners/diff.rb
diff options
context:
space:
mode:
authorKornelius Kalnbach <murphy@rubychan.de>2013-06-09 07:14:12 +0200
committerKornelius Kalnbach <murphy@rubychan.de>2013-06-09 07:14:12 +0200
commit1ad75645ad880ede3c0590fd6a700b1847cc3fe4 (patch)
tree89cd63d4c0833c51da92c4f84114a43eef237049 /lib/coderay/scanners/diff.rb
parent4323bb7ad9b5c5ddc770691d66e5727553ca33a3 (diff)
downloadcoderay-1ad75645ad880ede3c0590fd6a700b1847cc3fe4.tar.gz
don't allow \x00 in diff filenames
Diffstat (limited to 'lib/coderay/scanners/diff.rb')
-rw-r--r--lib/coderay/scanners/diff.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/coderay/scanners/diff.rb b/lib/coderay/scanners/diff.rb
index 8e3bf3c..af0f755 100644
--- a/lib/coderay/scanners/diff.rb
+++ b/lib/coderay/scanners/diff.rb
@@ -45,7 +45,7 @@ module Scanners
if match = scan(/--- |\+\+\+ |=+|_+/)
encoder.begin_line line_kind = :head
encoder.text_token match, :head
- if match = scan(/.+?(?=$|[\t\n\x00]| \(revision)/)
+ if match = scan(/[^\x00\n]+?(?=$|[\t\n]| \(revision)/)
encoder.text_token match, :filename
if options[:highlight_code] && match != '/dev/null'
file_type = CodeRay::FileType.fetch(match, :text)