From: Greg Hudson <ghudson@mit.edu>
Date: Sat, 5 May 2018 17:40:37 +0000 (-0400)
Subject: Escape curly braces in def-check.pl regexes
X-Git-Tag: krb5-1.17-beta1~128
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F774%2Fhead;p=thirdparty%2Fkrb5.git

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
---

diff --git a/src/util/def-check.pl b/src/util/def-check.pl
index a807e6e45b..ccdf8ef16b 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();