diff options
author | Campbell Barton <ideasman42@gmail.com> | 2007-07-12 15:51:21 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2007-07-12 15:51:21 +0400 |
commit | bfb9603cb47e524439d76f1ec303423b8ab8e9c3 (patch) | |
tree | f56bb85b85e262d918c7938073f98c0b6cb3ea9c /source/blender/python/api2_2x/Image.c | |
parent | e7c15b97e24c1923df8bef96ac35f9abd17c7964 (diff) |
From stable
Revision: 11237
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11237
Author: campbellbarton
Date: 2007-07-12 13:05:31 +0200 (Thu, 12 Jul 2007)
Log Message:
-----------
PyObject_IsTrue was missing a check for an error return value in many cases.
Diffstat (limited to 'source/blender/python/api2_2x/Image.c')
-rw-r--r-- | source/blender/python/api2_2x/Image.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/source/blender/python/api2_2x/Image.c b/source/blender/python/api2_2x/Image.c index dd2f667efe3..ddfc17c7deb 100644 --- a/source/blender/python/api2_2x/Image.c +++ b/source/blender/python/api2_2x/Image.c @@ -1095,7 +1095,12 @@ static int Image_setSource( BPy_Image *self, PyObject *args) static int Image_setFlag(BPy_Image *self, PyObject *value, void *flag) { - if ( PyObject_IsTrue(value) ) + int param = PyObject_IsTrue( value ); + if( param == -1 ) + return EXPP_ReturnIntError( PyExc_TypeError, + "expected True/False or 0/1" ); + + if ( param ) self->image->flag |= (int)flag; else self->image->flag &= ~(int)flag; @@ -1104,7 +1109,12 @@ static int Image_setFlag(BPy_Image *self, PyObject *value, void *flag) static int Image_setFlagTpage(BPy_Image *self, PyObject *value, void *flag) { - if ( PyObject_IsTrue(value) ) + int param = PyObject_IsTrue( value ); + if( param == -1 ) + return EXPP_ReturnIntError( PyExc_TypeError, + "expected True/False or 0/1" ); + + if ( param ) self->image->tpageflag |= (int)flag; else self->image->tpageflag &= ~(int)flag; |