From c30d5d9daadf6dbf9b987c02463669a2df991868 Mon Sep 17 00:00:00 2001 From: Greg Hudson Date: Sat, 5 May 2018 13:40:37 -0400 Subject: Escape curly braces in def-check.pl regexes Recent versions of Perl issue a warning or error when an unescaped open curly brace is used in a position where it might introduce a quantifier in a regular expression. Escape all regexp literal curly braces in def-check.pl. (cherry picked from commit 523e4ab050b13404a6929cc56ef873de8023e25c) ticket: 8677 version_fixed: 1.15.4 --- src/util/def-check.pl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/util/def-check.pl b/src/util/def-check.pl index a807e6e..ccdf8ef 100644 --- a/src/util/def-check.pl +++ b/src/util/def-check.pl @@ -62,7 +62,7 @@ while (! $h->eof()) { next LINE; } s/#.*$//; - if (/^} *$/) { + if (/^\} *$/) { next LINE; } # strip comments @@ -86,18 +86,18 @@ while (! $h->eof()) { if (/^[ \t]*$/) { next LINE; } - if (/^ *extern "C" {/) { + if (/^ *extern "C" \{/) { next LINE; } s/KRB5_ATTR_DEPRECATED//; # elide struct definitions Struct1: - if (/{[^}]*}/) { - s/{[^}]*}/ /g; + if (/\{[^}]*\}/) { + s/\{[^}]*\}/ /g; goto Struct1; } # multi-line defs - if (/{/) { + if (/\{/) { $_ .= "\n"; $len1 = length; $_ .= $h->getline(); -- cgit v1.1