[Xfce4-commits] <thunarx-python:master> Before trying to use an object instance, make sure that it is not null first. Protects against segmentation faults

[Adam Plumb]

Updating branch refs/heads/master
         to 4b353168b92a063511b7cb4474351839c893065d (commit)
       from dc2c3b577d88646fe17c838d3fdf51c7aeabaa1e (commit)

commit 4b353168b92a063511b7cb4474351839c893065d
Author: Adam Plumb <adamplumb at gmail.com>
Date:   Thu Jan 14 08:49:46 2010 -0500

    Before trying to use an object instance, make sure that it is not null first.  Protects against segmentation faults

 src/thunarx-python-object.c |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletions(-)

diff --git a/src/thunarx-python-object.c b/src/thunarx-python-object.c
index c26e8a2..33dc5c9 100644
--- a/src/thunarx-python-object.c
+++ b/src/thunarx-python-object.c
@@ -75,6 +75,13 @@ static GList *thunarx_python_object_get_renamers                (ThunarxRenamerP
 #define CHECK_METHOD_NAME(self)                                         \
 	if (!PyObject_HasAttrString(self, METHOD_NAME))                       \
 		goto beach;
+
+#define CHECK_OBJECT(object)										                        \
+  	if (object->instance == NULL)									                      \
+  	{																                                    \
+  		g_object_unref (object);									                        \
+  		goto beach;													                              \
+  	}																                                    \
 	
 #define CONVERT_LIST(py_files, files)                                   \
 	{                                                                     \
@@ -133,6 +140,7 @@ thunarx_python_object_get_file_actions (ThunarxMenuProvider *provider,
 	
   debug_enter();
 
+  CHECK_OBJECT(object);
 	CHECK_METHOD_NAME(object->instance);
 
 	CONVERT_LIST(py_files, files);
@@ -166,6 +174,7 @@ thunarx_python_object_get_folder_actions (ThunarxMenuProvider *provider,
 	
   debug_enter();
 
+  CHECK_OBJECT(object);
 	CHECK_METHOD_NAME(object->instance);
 
   py_ret = PyObject_CallMethod(object->instance, METHOD_PREFIX METHOD_NAME,
@@ -200,6 +209,7 @@ thunarx_python_object_get_dnd_actions (ThunarxMenuProvider *provider,
 	
   debug_enter();
 
+  CHECK_OBJECT(object);
 	CHECK_METHOD_NAME(object->instance);
 
 	CONVERT_LIST(py_files, files);
@@ -245,6 +255,7 @@ thunarx_python_object_get_property_pages (ThunarxPropertyPageProvider *provider,
 	
   debug_enter();
 
+  CHECK_OBJECT(object);
 	CHECK_METHOD_NAME(object->instance);
 
 	CONVERT_LIST(py_files, files);
@@ -276,6 +287,7 @@ thunarx_python_object_get_renamers (ThunarxRenamerProvider *provider)
 	
   debug_enter();
 
+  CHECK_OBJECT(object);
 	CHECK_METHOD_NAME(object->instance);
 
   py_ret = PyObject_CallMethod(object->instance, METHOD_PREFIX METHOD_NAME, "");
@@ -324,6 +336,7 @@ thunarx_python_object_get_preferences_actions (ThunarxPreferencesProvider *provi
 	
   debug_enter();
 
+  CHECK_OBJECT(object);
 	CHECK_METHOD_NAME(object->instance);
 
   py_ret = PyObject_CallMethod(object->instance, METHOD_PREFIX METHOD_NAME,
@@ -368,7 +381,8 @@ thunarx_python_object_finalize (GObject *object)
 {
   debug_enter();
 
-	Py_DECREF(((ThunarxPythonObject *)object)->instance);
+  if (((ThunarxPythonObject *)object)->instance != NULL)
+  	Py_DECREF(((ThunarxPythonObject *)object)->instance);
 }
 
 static void