No infinite loop on socket read error and EOF

operasoftware · Oct 23, 2014 · 0cd6a95 · 0cd6a95
1 parent d2b8649
commit 0cd6a95
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/lib/Munin/Node/Client.pm b/lib/Munin/Node/Client.pm
@@ -115,7 +115,7 @@ sub read_list {
     my ($self) = @_;
     my @data;
     my $line = $self->read;
-    while($line !~ /^\.$/) {
+    while($line !~ /^\.$/ and defined $line) {
         chomp $line;
         push(@data, $line);
         $line = $self->read;

diff --git a/t/Munin-Node-Client.t b/t/Munin-Node-Client.t
@@ -5,9 +5,16 @@
 
 # change 'tests => 1' to 'tests => last_test_to_print';
 
-use Test::More tests => 1;
+use Test::More tests => 2;
 BEGIN { use_ok('Munin::Node::Client') };
 
+
+my $node = bless { socket => undef }, 'Munin::Node::Client';
+
+alarm 1;
+$node->read_list();
+ok(1, 'No infinite loop on read error');
+
 #########################
 
 # Insert your test code below, the Test::More module is use()ed here so read