From 0d13ed3a17e9a98678a1695921bb479294b4b210 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Thu, 31 Aug 2017 11:35:25 +0200 Subject: [PATCH] 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 (Merged from https://github.com/openssl/openssl/pull/4304) (cherry picked from commit e66b62b86e7725bdace0f24a76baa61db9c763f8) --- util/mkdef.pl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/util/mkdef.pl b/util/mkdef.pl index b0571157bd..5fb2f855d2 100755 --- a/util/mkdef.pl +++ b/util/mkdef.pl @@ -458,10 +458,10 @@ sub do_defs print STDERR "DEBUG: parsing ----------\n" if $debug; while() { + 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) { @@ -875,7 +875,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; } -- 2.50.1