[Interp] Supress uninitalized value if abs_path fails (closes #120 by…

… Craig Andrews @candrews).
liske · Jun 24, 2018 · 071b9e4 · 071b9e4
1 parent 0dadb2c
commit 071b9e4
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -6,6 +6,8 @@ needrestart (3.3) unstable; urgency=high
       (Debian Bug#902031 by Axel Beckert <abe@debian.org>)
       (Debian Bug#902049 by Jon <nuxi@vault24.org>)
       (github issue #121 by Sven Hartge @shartge)
+    - [Interp] Supress uninitalized value if abs_path fails.
+      (github issue #120 by Craig Andrews @candrews)
 
  -- Thomas Liske <thomas@fiasko-nw.net>  
 

diff --git a/perl/lib/NeedRestart/Interp/Perl.pm b/perl/lib/NeedRestart/Interp/Perl.pm
@@ -85,7 +85,7 @@ sub source {
 
     my $src = abs_path($ARGV[0]);
     chdir($cwd);
-    unless(-r $src && -f $src) {
+    unless(defined($src) && -r $src && -f $src) {
 	print STDERR "$LOGPREF #$pid: source file not found, skipping\n" if($self->{debug});
 	print STDERR "$LOGPREF #$pid:  reduced ARGV: ".join(' ', @ARGV)."\n" if($self->{debug});
 	return undef;
@@ -136,7 +136,7 @@ sub files {
 	return ();
     }
     my $src = abs_path ($ARGV[0]);
-    unless(-r $src && -f $src) {
+    unless(defined($src) && -r $src && -f $src) {
 	chdir($cwd);
 	print STDERR "$LOGPREF #$pid: source file not found, skipping\n" if($self->{debug});
 	print STDERR "$LOGPREF #$pid:  reduced ARGV: ".join(' ', @ARGV)."\n" if($self->{debug});

diff --git a/perl/lib/NeedRestart/Interp/Python.pm b/perl/lib/NeedRestart/Interp/Python.pm
@@ -116,7 +116,7 @@ sub source {
 
     my $src = abs_path($ARGV[0]);
     chdir($cwd);
-    unless(-r $src && -f $src) {
+    unless(defined($src) && -r $src && -f $src) {
 	print STDERR "$LOGPREF #$pid: source file not found, skipping\n" if($self->{debug});
 	print STDERR "$LOGPREF #$pid:  reduced ARGV: ".join(' ', @ARGV)."\n" if($self->{debug});
 	return undef;
@@ -167,7 +167,7 @@ sub files {
 	return ();
     }
     my $src = abs_path ($ARGV[0]);
-    unless(-r $src && -f $src) {
+    unless(defined($src) && -r $src && -f $src) {
 	chdir($cwd);
 	print STDERR "$LOGPREF #$pid: source file not found, skipping\n" if($self->{debug});
 	print STDERR "$LOGPREF #$pid:  reduced ARGV: ".join(' ', @ARGV)."\n" if($self->{debug});

diff --git a/perl/lib/NeedRestart/Interp/Ruby.pm b/perl/lib/NeedRestart/Interp/Ruby.pm
@@ -113,7 +113,7 @@ sub source {
 
     my $src = abs_path($ARGV[0]);
     chdir($cwd);
-    unless(-r $src && -f $src) {
+    unless(defined($src) && -r $src && -f $src) {
 	print STDERR "$LOGPREF #$pid: source file '$src' not found, skipping\n" if($self->{debug});
 	print STDERR "$LOGPREF #$pid:  reduced ARGV: ".join(' ', @ARGV)."\n" if($self->{debug});
 	return undef;