krb5 commit: Escape curly braces in def-check.pl regexes

Greg Hudson ghudson at mit.edu
Tue May 8 12:53:02 EDT 2018


https://github.com/krb5/krb5/commit/523e4ab050b13404a6929cc56ef873de8023e25c
commit 523e4ab050b13404a6929cc56ef873de8023e25c
Author: Greg Hudson <ghudson at mit.edu>
Date:   Sat May 5 13:40:37 2018 -0400

    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.
    
    ticket: 8677 (new)
    tags: pullup
    target_version: 1.16-next
    target_version: 1.15-next

 src/util/def-check.pl |   10 +++++-----
 1 files 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();


More information about the cvs-krb5 mailing list