Changeset 10825 for trunk/gsdl/bin/script/pluginfo.pl

Timestamp:

2005-11-02T14:24:39+13:00 (18 years ago)

Author:

jrm21

Message:

1) print usage if given -h or --help
2) set language before printing usage for bad options
3) be more careful when using 'eval' statement so we don't execute

any old code.

File:

• trunk/gsdl/bin/script/pluginfo.pl (modified) (2 diffs)

trunk/gsdl/bin/script/pluginfo.pl

@@ -84 +84 @@
     my $blnParseFailed = "false";
     # general options available to all plugins
-    my $intArgLeftinAfterParsing = parse2::parse(\@ARGV,$arguments,$hashParsingResult,"allow_extra_options");
-    # If there are more than one argument left after parsing, it mean user input too many arguments.
-    # Error occoured  will return 0
-    if($intArgLeftinAfterParsing > 1)
-    {
-    &PrintUsage::print_txt_usage($options, "{pluginfo.params}");
-    die "\n";
-    }
+    my $unparsed_args = parse2::parse(\@ARGV,$arguments,$hashParsingResult,"allow_extra_options");
 
     foreach my $strVariable (keys %$hashParsingResult)
     {
-    eval "\$$strVariable = \$hashParsingResult->{\"\$strVariable\"}";
+    my $value = $hashParsingResult->{$strVariable};
+    # test to make sure the variable name is 'safe'
+    if ($strVariable !~ /^\w+$/) {
+        die "variable name '$strVariable' isn't safe!";
+    }
+    eval "\$$strVariable = \$value";
     }
 
@@ -118 +116 @@
         $gsprintf::specialoutputencoding=$encoding;
     }
+    }
+
+    # If there are more than one argument left after parsing, it mean user input too many arguments.
+    # Error occoured  will return 0
+    if( $unparsed_args > 1 or (@ARGV && $ARGV[0] =~ /^\-+h/) )
+    {
+    PrintUsage::print_txt_usage($options, "{pluginfo.params}");
+    die "\n";
     }