Changeset 30071 for trunk/PS-IPP-Config/lib/PS/IPP/Config.pm

Timestamp:

Dec 16, 2010, 1:06:08 PM (15 years ago)

Author:

bills

Message:

Need to check that scheme is defined before dereferencing it

File:

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

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

@@ -1107 +1107 @@
     }
 
-    if (file_scheme($output) ne 'neb') {
+    my $scheme = file_scheme($output);
+    if (!$scheme or ($scheme ne 'neb')) {
         # non-nebulous file we're done
-        if ($delete_existing) {
+        if ($delete_existing and $self->file_exists($output)) {
             if (!$self->file_delete($output)) {
                 carp "failed to delete $output";
@@ -1181 +1182 @@
     my $copies = shift;
 
-    if (file_scheme($file) ne 'neb') {
+    my $scheme = file_scheme($file);
+    if (!$scheme or ($scheme ne 'neb')) {
         carp "cannot replicate non-neulous file: $file";
         return 0;