Changeset 14794

Timestamp:

Sep 7, 2007, 11:39:58 AM (19 years ago)

Author:

Paul Price

Message:

Ensuring scheme is defined before sucking it off.

File:

• trunk/PS-IPP-Config/lib/PS/IPP/Config.pm (modified) (3 diffs)

trunk/PS-IPP-Config/lib/PS/IPP/Config.pm

@@ -1 +1 @@
 # Copyright (c) 2006  Paul Price, Joshua Hoblitt
 #
-# $Id: Config.pm,v 1.68 2007-09-07 21:29:50 price Exp $
+# $Id: Config.pm,v 1.69 2007-09-07 21:39:58 price Exp $
 
 package PS::IPP::Config;
@@ -196 +196 @@
     carp "base is not inited" if not defined $base;
     my $scheme = file_scheme($base); # The scheme, e.g., file://, path://
-    $base =~ s|^$scheme:/*||;
+    $base =~ s|^$scheme:/*|| if defined $scheme;
 
     my $root = '';
@@ -480 +480 @@
         if ($name =~ m|^/|) { return $name; }
         # without a leading slash, this is an error
-        carp "Programming error";
-        exit($PS_EXIT_PROG_ERROR);
+        carp "Relative file name provided: relative paths are not permitted.";
+        exit($PS_EXIT_SYS_ERROR);
     }