util/dofile.pl: report if a template couldn't be loaded
authorRichard Levitte <levitte@openssl.org>
Tue, 20 Sep 2016 23:49:04 +0000 (01:49 +0200)
committerRichard Levitte <richard@levitte.org>
Wed, 21 Sep 2016 00:40:11 +0000 (02:40 +0200)
Reviewed-by: Rich Salz <rsalz@openssl.org>
(cherry picked from commit f6be8315cbdb4173008b5917d2b0fc80bb0bf06b)

util/dofile.pl

index e0333fe56851dd3216be84fdf96c6577451c027d..8b0c7b41c0667749aa9030252225886ff303210b 100644 (file)
@@ -159,7 +159,11 @@ my @autowarntext = ("WARNING: do not edit!",
 my $prev_linecount = 0;
 my $text =
     @ARGV
-    ? join("", map { my $x = "{- output_reset_on() -}".Text::Template::_load_text($_);
+    ? join("", map { my $x = Text::Template::_load_text($_);
+                     if (!defined($x)) {
+                         die $Text::Template::ERROR, "\n";
+                     }
+                     $x = "{- output_reset_on() -}" . $x;
                      my $linecount = $x =~ tr/\n//;
                      $prev_linecount = ($linecount += $prev_linecount);
                      $lines{$linecount} = $_;