[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28216] branches/render25/source/blender/ blenkernel/intern/image.c: fix for missing null pointer check.
Campbell Barton
ideasman42 at gmail.com
Thu Apr 15 23:33:48 CEST 2010
Revision: 28216
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28216
Author: campbellbarton
Date: 2010-04-15 23:33:47 +0200 (Thu, 15 Apr 2010)
Log Message:
-----------
fix for missing null pointer check.
Modified Paths:
--------------
branches/render25/source/blender/blenkernel/intern/image.c
Modified: branches/render25/source/blender/blenkernel/intern/image.c
===================================================================
--- branches/render25/source/blender/blenkernel/intern/image.c 2010-04-15 20:37:47 UTC (rev 28215)
+++ branches/render25/source/blender/blenkernel/intern/image.c 2010-04-15 21:33:47 UTC (rev 28216)
@@ -1742,7 +1742,8 @@
return ibuf;
}
-/* cfra used for # code, Image can only have this # for all its users */
+/* cfra used for # code, Image can only have this # for all its users
+ * warning, 'iuser' can be NULL */
static ImBuf *image_load_image_file(Image *ima, ImageUser *iuser, int cfra)
{
struct ImBuf *ibuf;
@@ -1758,7 +1759,7 @@
}
else {
flag= IB_rect|IB_multilayer|IB_metadata;
- if(iuser->flag & IMA_USECACHE)
+ if(iuser && iuser->flag & IMA_USECACHE)
flag |= IB_usecache;
/* get the right string */
More information about the Bf-blender-cvs
mailing list