texlive[45774] Master: fix possible undefined behaviour in paper

[commits+preining at tug.org]

Revision: 45774
          http://tug.org/svn/texlive?view=revision&revision=45774
Author:   preining
Date:     2017-11-13 15:46:04 +0100 (Mon, 13 Nov 2017)
Log Message:
-----------
fix possible undefined behaviour in paper handling

Modified Paths:
--------------
    trunk/Master/texmf-dist/scripts/texlive/tlmgr.pl
    trunk/Master/tlpkg/TeXLive/TLPDB.pm

Modified: trunk/Master/texmf-dist/scripts/texlive/tlmgr.pl
===================================================================
--- trunk/Master/texmf-dist/scripts/texlive/tlmgr.pl	2017-11-13 06:15:58 UTC (rev 45773)
+++ trunk/Master/texmf-dist/scripts/texlive/tlmgr.pl	2017-11-13 14:46:04 UTC (rev 45774)
@@ -1237,8 +1237,12 @@
   } else {  # program-specific paper
     my $prog = $action;     # first argument is the program to change
     my $pkg = $TeXLive::TLPaper::paper{$prog}{'pkg'};
+    if (!$pkg) {
+      tlwarn("Unknown paper configuration program $prog!\n");
+      return ($F_ERROR);
+    }
     if (!$localtlpdb->get_package($pkg)) {
-      tlwarn("$prg: package $pkg is not installed - cannot adjust paper size!\n");
+      tlwarn("$prg: package $prog is not installed - cannot adjust paper size!\n");
       return ($F_ERROR);
     }
     my $arg = shift @ARGV;  # get "paper" argument

Modified: trunk/Master/tlpkg/TeXLive/TLPDB.pm
===================================================================
--- trunk/Master/tlpkg/TeXLive/TLPDB.pm	2017-11-13 06:15:58 UTC (rev 45773)
+++ trunk/Master/tlpkg/TeXLive/TLPDB.pm	2017-11-13 14:46:04 UTC (rev 45774)
@@ -737,6 +737,7 @@
 
 sub _get_package {
   my ($self,$pkg) = @_;
+  return undef if (!$pkg);
   if (defined($self->{'tlps'}{$pkg})) {
   my $ret = $self->{'tlps'}{$pkg};
     return $self->{'tlps'}{$pkg};