[gentoo-commits] gentoo-x86 commit in gnome-base/gnome-session/files: gnome-session-2.26.2-xsmp-stop-throw-error.patch

[Romain Perier (mrpouet)]

mrpouet     09/10/29 11:11:18

  Added:                gnome-session-2.26.2-xsmp-stop-throw-error.patch
  Log:
  Fix bug #271023, Do not crash when xsmp->priv->conn is NULL for a given GsmXsmpClient, when SMS connection dies. Import from 2.28 dev cycle, new revision.
  (Portage version: 2.2_rc46/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  gnome-base/gnome-session/files/gnome-session-2.26.2-xsmp-stop-throw-error.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/gnome-session/files/gnome-session-2.26.2-xsmp-stop-throw-error.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/gnome-session/files/gnome-session-2.26.2-xsmp-stop-throw-error.patch?rev=1.1&content-type=text/plain

Index: gnome-session-2.26.2-xsmp-stop-throw-error.patch
===================================================================
From: Romain Perier <mrpouet@g.o>
Date: Wed, 28 Oct 2009 17:20:04 +0100
Subject: Avoid a SIGSEGV in xsmp_stop() when the SmsConn object is NULL, in this case we must throw an GError (imported from 2.28 dev cycle)

When xsmp->priv->conn is NULL in xsmp_end_session() for a given GsmXsmpClient object, it implies
that this same object in xsmp_stop() will also have a NULL SmsConn field.

---
 gnome-session/gsm-xsmp-client.c |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

--- a/gnome-session/gsm-xsmp-client.c
+++ b/gnome-session/gsm-xsmp-client.c
@@ -702,6 +702,13 @@ xsmp_stop (GsmClient *client,
 
         g_debug ("GsmXSMPClient: xsmp_stop ('%s')", xsmp->priv->description);
 
+        if (xsmp->priv->conn == NULL) {
+                g_set_error (error,
+                             GSM_CLIENT_ERROR,
+                             GSM_CLIENT_ERROR_NOT_REGISTERED,
+                             "Client is not registered");
+                return FALSE;
+        }
         SmsDie (xsmp->priv->conn);
 
         return TRUE;