[gnumeric] Fix a crasher in excelplugin: don't call a NULL function. [#610012]



commit 1bf0893bfe4aa7e6fc9f030a32911a1b51941b9f
Author: Jean Brefort <jean brefort normalesup org>
Date:   Tue Feb 16 16:06:59 2010 +0100

    Fix a crasher in excelplugin: don't call a NULL function. [#610012]

 ChangeLog                           |    6 ++++++
 NEWS                                |    3 +++
 plugins/excelplugins/excelplugins.c |    2 +-
 3 files changed, 10 insertions(+), 1 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 85619a9..b9c75c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-02-16  Jean Brefort  <jean brefort normalesup org>
+
+	* plugins/excelplugins/excelplugins.c
+	(scan_for_XLLs_and_register_functions): don't call a NULL function.
+	[#610012]
+
 2010-02-13  Morten Welinder <terra gnome org>
 
 	* configure.in: Post-release bump.
diff --git a/NEWS b/NEWS
index 0f6645e..046e27d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,8 @@
 Gnumeric 1.10.1
 
+Jean:
+	* Fix a crasher in excelplugin: don't call a NULL function. [#610012]
+
 --------------------------------------------------------------------------
 Gnumeric 1.10.0
 
diff --git a/plugins/excelplugins/excelplugins.c b/plugins/excelplugins/excelplugins.c
index eeb5a89..9a4bf82 100644
--- a/plugins/excelplugins/excelplugins.c
+++ b/plugins/excelplugins/excelplugins.c
@@ -991,7 +991,7 @@ scan_for_XLLs_and_register_functions (const gchar *dir_name)
 							xll->handle = handle;
 							g_module_symbol (xll->handle, "xlAutoFree", (gpointer) &xll->xlAutoFree);
 							xlAutoOpenFunc = NULL;
-							if (g_module_symbol (xll->handle, "xlAutoOpen", (gpointer) &xlAutoOpenFunc)) {
+							if (g_module_symbol (xll->handle, "xlAutoOpen", (gpointer) &xlAutoOpenFunc) && xlAutoOpenFunc) {
 								currently_called_xll = xll;
 								xlAutoOpenFunc ();
 								currently_called_xll = NULL;



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]