From: Tony Cook <tony@develop-help.com>
Date: Sat, 24 Nov 2018 01:32:41 +0000 (+1100)
Subject: improve error reporting for the polygon method
X-Git-Tag: v1.007~3
X-Git-Url: http://git.imager.perl.org/imager.git/commitdiff_plain/3063ecbb7e74c693653fa31ca5974892946d1f64

improve error reporting for the polygon method
---

diff --git a/Imager.pm b/Imager.pm
index c8d24365..d3caaf4c 100644
--- a/Imager.pm
+++ b/Imager.pm
@@ -3106,16 +3106,20 @@ sub polygon {
         return undef;
       }
     }
-    i_poly_aa_cfill_m($self->{IMG}, $opts{'x'}, $opts{'y'}, 
-                    $mode, $opts{'fill'}{'fill'});
+    unless (i_poly_aa_cfill_m($self->{IMG}, $opts{'x'}, $opts{'y'},
+			      $mode, $opts{'fill'}{'fill'})) {
+      return $self->_set_error($self->_error_as_msg);
+    }
   }
   else {
     my $color = _color($opts{'color'});
     unless ($color) { 
       $self->{ERRSTR} = $Imager::ERRSTR; 
-      return; 
+      return;
+    }
+    unless (i_poly_aa_m($self->{IMG}, $opts{'x'}, $opts{'y'}, $mode, $color)) {
+      return $self->_set_error($self->_error_as_msg);
     }
-    i_poly_aa_m($self->{IMG}, $opts{'x'}, $opts{'y'}, $mode, $color);
   }
 
   return $self;
diff --git a/t/250-draw/050-polyaa.t b/t/250-draw/050-polyaa.t
index 5992b547..705d5cb3 100644
--- a/t/250-draw/050-polyaa.t
+++ b/t/250-draw/050-polyaa.t
@@ -1,7 +1,7 @@
 #!perl -w
 
 use strict;
-use Test::More tests => 24;
+use Test::More tests => 28;
 
 use Imager qw/NC/;
 use Imager::Test qw(is_image is_color3);
@@ -249,6 +249,20 @@ my $black = Imager::Color->new(0, 0, 0);
      "save to file");
 }
 
+{
+  # fail 2 point polygon
+  my $im = Imager->new(xsize => 10, ysize => 10);
+  ok(!$im->polygon(x => [ 0, 5 ], y => [ 0, 5 ]),
+     "fail to draw poly with only two points");
+  like($im->errstr, qr/polygons must have at least 3 points/,
+       "check error message");
+  my $im2 = Imager->new(xsize => 10, ysize => 10);
+  ok(!$im2->polygon(x => [ 0, 5 ], y => [ 0, 5 ], fill => { solid => "#FFFFFF" }),
+     "fail to draw poly with only two points (fill)");
+  like($im2->errstr, qr/polygons must have at least 3 points/,
+       "check error message");
+}
+
 Imager->close_log;
 
 Imager::malloc_state();