Skip to content

fix stop early bug when scanning for watermarks #1423

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
2 commits merged into from
Oct 10, 2018
Merged

fix stop early bug when scanning for watermarks #1423

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
615dafe
fix stop early bug when scanning for watermarks
Oct 8, 2018
8f274bc
Merge branch 'master' into master
jeremiedimino Oct 10, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/watermarks.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ let make_watermark_map ~name ~version ~commit =
let subst_string s path ~map =
let len = String.length s in
let longest_var = String.longest (String.Map.keys map) in
let double_percent_len = String.length "%%" in
let loc_of_offset ~ofs ~len =
let rec loop lnum bol i =
if i = ofs then
Expand Down Expand Up @@ -104,7 +105,7 @@ let subst_string s path ~map =
| 'A'..'Z' | '_' -> in_var ~start (i + 1) acc
| _ -> loop (i + 1) acc
and in_var ~start i acc =
if i - start > longest_var then
if i - start > longest_var + double_percent_len then
loop i acc
else if i = len then
acc
Expand Down