[gimp] app: don't dereference a NULL session_info->p->factory_entry



commit 7cbd1c5739d088910ef408182c73838332235b87
Author: Michael Natterer <mitch gimp org>
Date:   Fri Mar 30 09:55:45 2012 +0200

    app: don't dereference a NULL session_info->p->factory_entry

 app/widgets/gimpsessioninfo.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/app/widgets/gimpsessioninfo.c b/app/widgets/gimpsessioninfo.c
index 1403566..d55c0e4 100644
--- a/app/widgets/gimpsessioninfo.c
+++ b/app/widgets/gimpsessioninfo.c
@@ -359,7 +359,8 @@ gimp_session_info_deserialize (GimpConfig *config,
                 if (GPOINTER_TO_INT (scanner->value.v_symbol) == SESSION_INFO_DOCK &&
                     info->p->factory_entry &&
                     info->p->factory_entry->identifier &&
-                    strcmp ("gimp-toolbox-window", info->p->factory_entry->identifier) == 0)
+                    strcmp ("gimp-toolbox-window",
+                            info->p->factory_entry->identifier) == 0)
                   {
                     dock_type = "gimp-toolbox";
                   }
@@ -407,6 +408,7 @@ gimp_session_info_deserialize (GimpConfig *config,
    * sessionrc file from GIMP <= 2.6 and add a toolbox dock manually
    */
   if (! info->p->docks &&
+      info->p->factory_entry &&
       strcmp ("gimp-toolbox-window",
               info->p->factory_entry->identifier) == 0)
     {



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