diff options
| author | Richard Levitte <levitte@openssl.org> | 2017-08-31 11:35:25 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2017-08-31 19:20:30 +0200 |
| commit | e66b62b86e7725bdace0f24a76baa61db9c763f8 (patch) | |
| tree | 630294b3230c35d9423d360915adc1b0f0b5f19c | |
| parent | 0ef2802165706016698d6984dfcb2980881f18e5 (diff) | |
util/mkdef.pl: handle line terminators correctly
When parsing the header files, mkdef.pl didn't clear the line
terminator properly. In most cases, this didn't matter, but there
were moments when this caused parsing errors (such as CRLFs in certain
cases).
Fixes #4267
Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4304)
| -rwxr-xr-x | util/mkdef.pl | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/util/mkdef.pl b/util/mkdef.pl index 8c0ccd0c76..7a4e455cd9 100755 --- a/util/mkdef.pl +++ b/util/mkdef.pl @@ -412,10 +412,10 @@ sub do_defs print STDERR "DEBUG: parsing ----------\n" if $debug; while(<IN>) { + s|\R$||; # Better chomp if($parens > 0) { #Inside a DEPRECATEDIN $stored_multiline .= $_; - $stored_multiline =~ s|\R$||; # Better chomp print STDERR "DEBUG: Continuing multiline DEPRECATEDIN: $stored_multiline\n" if $debug; $parens = count_parens($stored_multiline); if ($parens == 0) { @@ -847,7 +847,6 @@ sub do_defs \@current_algorithms); } else { $stored_multiline = $_; - $stored_multiline =~ s|\R$||; print STDERR "DEBUG: Found multiline DEPRECATEDIN starting with: $stored_multiline\n" if $debug; next; } |