[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26349] trunk/blender/source/blender/ blenkernel/intern/context.c: ctx_data_pointer_verify is a verified NULL value if C is NULL.

[Martin Poirier]

Revision: 26349
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26349
Author:   theeth
Date:     2010-01-27 21:12:54 +0100 (Wed, 27 Jan 2010)

Log Message:
-----------
ctx_data_pointer_verify is a verified NULL value if C is NULL.

prevents ctx_data_main and ctx_data_scene from crashing on NULL context

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/context.c

Modified: trunk/blender/source/blender/blenkernel/intern/context.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/context.c    2010-01-27 
19:46:12 UTC (rev 26348)
+++ trunk/blender/source/blender/blenkernel/intern/context.c    2010-01-27 
20:12:54 UTC (rev 26349)
@@ -486,7 +486,12 @@
 {
        bContextDataResult result;
 
-       if(ctx_data_get((bContext*)C, member, &result)==1) {
+       /* if context is NULL, pointer must be NULL too and that is a valid 
return */
+       if (C == NULL) {
+               *pointer= NULL;
+               return 1;
+       }
+       else if(ctx_data_get((bContext*)C, member, &result)==1) {
                *pointer= result.ptr.data;
                return 1;
        }


_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs