[Matplotlib-checkins] SF.net SVN: matplotlib: [3547] trunk/matplotlib

[<as...@us...>]

Revision: 3547
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=3547&view=rev
Author:   astraw
Date:     2007-07-17 03:09:27 -0700 (Tue, 17 Jul 2007)

Log Message:
-----------
bugfix segfault in transforms module. Thanks Ben North for the patch

Modified Paths:
--------------
    trunk/matplotlib/CHANGELOG
    trunk/matplotlib/src/_transforms.cpp

Modified: trunk/matplotlib/CHANGELOG
===================================================================
--- trunk/matplotlib/CHANGELOG	2007-07-16 22:19:24 UTC (rev 3546)
+++ trunk/matplotlib/CHANGELOG	2007-07-17 10:09:27 UTC (rev 3547)
@@ -1,3 +1,6 @@
+2007-07-17 bugfix segfault in transforms module. Thanks Ben North for
+           the patch. - ADS
+
 2007-07-16 clean up some code in ticker.ScalarFormatter, use unicode to
            render multiplication sign in offset ticklabel - DSD
 

Modified: trunk/matplotlib/src/_transforms.cpp
===================================================================
--- trunk/matplotlib/src/_transforms.cpp	2007-07-16 22:19:24 UTC (rev 3546)
+++ trunk/matplotlib/src/_transforms.cpp	2007-07-17 10:09:27 UTC (rev 3547)
@@ -33,7 +33,7 @@
 int
 LazyValue::compare(const Py::Object &other) {
   if (!check(other))
-    throw Py::TypeError("Can on compare LazyValues with LazyValues");
+    throw Py::TypeError("Can only compare LazyValues with LazyValues");
   LazyValue* pother = static_cast<LazyValue*>(other.ptr());
   double valself = val();
   double valother = pother->val();
@@ -2079,12 +2079,13 @@
 
   args.verify_length(6);
 
-  LazyValue::check(args[0]);
-  LazyValue::check(args[1]);
-  LazyValue::check(args[2]);
-  LazyValue::check(args[3]);
-  LazyValue::check(args[4]);
-  LazyValue::check(args[5]);
+  if (!LazyValue::check(args[0])
+      || !LazyValue::check(args[1])
+      || !LazyValue::check(args[2])
+      || !LazyValue::check(args[3])
+      || !LazyValue::check(args[4])
+      || !LazyValue::check(args[5]))
+    throw Py::TypeError("Affine(a, b, c, d, tx, ty) expected 6 LazyValue args");
 
   LazyValue* a  = static_cast<LazyValue*>(args[0].ptr());
   LazyValue* b  = static_cast<LazyValue*>(args[1].ptr());


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.