You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by mm...@apache.org on 2010/03/31 16:05:34 UTC
svn commit: r929544 -
/spamassassin/branches/3.3/lib/Mail/SpamAssassin/Plugin/ImageInfo.pm
Author: mmartinec
Date: Wed Mar 31 14:05:34 2010
New Revision: 929544
URL: http://svn.apache.org/viewvc?rev=929544&view=rev
Log:
Fix two undef warnings in SA::Plugin::ImageInfo
Modified:
spamassassin/branches/3.3/lib/Mail/SpamAssassin/Plugin/ImageInfo.pm
Modified: spamassassin/branches/3.3/lib/Mail/SpamAssassin/Plugin/ImageInfo.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.3/lib/Mail/SpamAssassin/Plugin/ImageInfo.pm?rev=929544&r1=929543&r2=929544&view=diff
==============================================================================
--- spamassassin/branches/3.3/lib/Mail/SpamAssassin/Plugin/ImageInfo.pm (original)
+++ spamassassin/branches/3.3/lib/Mail/SpamAssassin/Plugin/ImageInfo.pm Wed Mar 31 14:05:34 2010
@@ -191,9 +191,9 @@ my %get_details = (
my ($prec, $height, $width, $comps) = (undef,0,0,undef);
while (1) {
my ($xx, $mark, $len) = unpack("CCn", substr($data, $pos, $chunksize));
- last if ($xx != 0xFF);
- last if ($mark == 0xDA || $mark == 0xD9);
- last if ($len < 2);
+ last if (!defined $xx || $xx != 0xFF);
+ last if (!defined $mark || $mark == 0xDA || $mark == 0xD9);
+ last if (!defined $len || $len < 2);
$pos += $chunksize;
my $block = substr($data, $pos, $len - 2);
my $blocklen = length($block);