* Fix crash when linking something illegal to an Object.

  Pointed out and fixed by Stephen Swaney

1 files changed, 7 insertions, 0 deletions

diff --git a/source/blender/python/api2_2x/Object.c b/source/blender/python/api2_2x/Object.c
index 8dc0a1d9900..096f4c22803 100644
--- a/source/blender/python/api2_2x/Object.c
+++ b/source/blender/python/api2_2x/Object.c
@@ -803,6 +803,13 @@ static PyObject *Object_link (BPy_Object *self, PyObject *args)
     if (NMesh_CheckPyObject (py_data))
         data = (void *)NMesh_FromPyObject (py_data);
 
+    /* have we set data to something good? */
+    if( !data )
+    {
+        return (PythonReturnErrorObject (PyExc_AttributeError,
+            "link argument type is not supported "));
+    }
+
     oldid = (ID*) self->object->data;
     id = (ID*) data;
     obj_id = MAKE_ID2 (id->name[0], id->name[1]);