From b5cd81ae61642e86627c333472a080471b9645e8 Mon Sep 17 00:00:00 2001 From: Veerapuram Varadhan Date: Mon, 23 Jan 2006 14:12:19 +0000 Subject: [PATCH] ** Fixes #327427 Do not ref a NULL object. ** Fixes #327427 * libedata-cal/e-data-cal-factory.c: (impl_CalFactory_getCal): Do not ref a NULL object. --- calendar/ChangeLog | 6 ++++++ calendar/libedata-cal/e-data-cal-factory.c | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 897d98f..f57b4c9 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,9 @@ +2006-01-23 Veerapuram Varadhan + + ** Fixes #327427 + * libedata-cal/e-data-cal-factory.c: (impl_CalFactory_getCal): Do + not ref a NULL object. + 2006-01-23 Chenthill Palanisamy Fixes #305656 diff --git a/calendar/libedata-cal/e-data-cal-factory.c b/calendar/libedata-cal/e-data-cal-factory.c index 4adc481..c27d70f 100644 --- a/calendar/libedata-cal/e-data-cal-factory.c +++ b/calendar/libedata-cal/e-data-cal-factory.c @@ -138,6 +138,7 @@ impl_CalFactory_getCal (PortableServer_Servant servant, const GNOME_Evolution_Calendar_CalListener listener, CORBA_Environment *ev) { + GNOME_Evolution_Calendar_Cal ret_cal = NULL; EDataCalFactory *factory; EDataCalFactoryPrivate *priv; EDataCal *cal = CORBA_OBJECT_NIL; @@ -233,12 +234,13 @@ impl_CalFactory_getCal (PortableServer_Servant servant, e_cal_backend_add_client (backend, cal); e_cal_backend_set_mode (backend, priv->mode); + ret_cal = CORBA_Object_duplicate (BONOBO_OBJREF (cal), ev); cleanup: e_uri_free (uri); g_free (uri_type_string); g_object_unref (source); - return CORBA_Object_duplicate (BONOBO_OBJREF (cal), ev); + return ret_cal; } -- 2.7.4