From: Michael Jerris <mike@jerris.com>
Date: Mon, 31 May 2010 12:55:42 +0000 (-0400)
Subject: sofia-sip: fix null derefernce segfault in soa
X-Git-Tag: v1.2-rc1~787
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f356c5e6f318a77a56e6d21c20e9ae591339db04;p=thirdparty%2Ffreeswitch.git

sofia-sip: fix null derefernce segfault in soa
---

diff --git a/libs/sofia-sip/.update b/libs/sofia-sip/.update
index f392518516..b3e674b88b 100644
--- a/libs/sofia-sip/.update
+++ b/libs/sofia-sip/.update
@@ -1 +1 @@
-Fri Mar 26 12:20:14 CDT 2010
+Mon May 31 08:54:37 EDT 2010
diff --git a/libs/sofia-sip/libsofia-sip-ua/soa/soa_static.c b/libs/sofia-sip/libsofia-sip-ua/soa/soa_static.c
index 293561287c..f94f9b2962 100644
--- a/libs/sofia-sip/libsofia-sip-ua/soa/soa_static.c
+++ b/libs/sofia-sip/libsofia-sip-ua/soa/soa_static.c
@@ -1289,18 +1289,19 @@ static int offer_answer_step(soa_session_t *ss,
 
   /* Step F0: Initialize o= line */
   if (fresh) {
-    if (user->sdp_origin)
+	if (user->sdp_origin) {
       o->o_username = user->sdp_origin->o_username;
 
-	if (user->sdp_origin->o_address)
-	  o->o_address = user->sdp_origin->o_address;
+	  if (user->sdp_origin->o_address)
+	    o->o_address = user->sdp_origin->o_address;
 
-    if (user->sdp_origin->o_id)
-		o->o_id = user->sdp_origin->o_id;
+      if (user->sdp_origin->o_id)
+		  o->o_id = user->sdp_origin->o_id;
 
-	if (user->sdp_origin->o_version && user->sdp_origin->o_version != o->o_version) {
-		o->o_version = user->sdp_origin->o_version;
-		o->o_version--;
+	  if (user->sdp_origin->o_version && user->sdp_origin->o_version != o->o_version) {
+		  o->o_version = user->sdp_origin->o_version;
+		  o->o_version--;
+	  }
 	}
 
     if (soa_init_sdp_origin_with_session(ss, o, c0_buffer, local) < 0) {