Tue May 20 09:35:46 EDT 2008 Pekka.Pessi@nokia.com

  * soa_static.c: fixed klocwork issues

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@8618 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/libs/sofia-sip/.update b/libs/sofia-sip/.update
index c6caaff909abb1df6ab9031eb90b0cd8af62eb55..699342f78c9f29c93a922d60111ab5692af48cca 100644 (file)
--- a/libs/sofia-sip/.update
+++ b/libs/sofia-sip/.update
@@ -1 +1 @@
-Sun May 25 11:05:03 EDT 2008
+Sun May 25 11:06:22 EDT 2008

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 bee4f4b9490380d399cc20489913a46966c8a872..b73cfd52fac87c3e4a66e155bd2cdbedfa944b1c 100644 (file)
--- a/libs/sofia-sip/libsofia-sip-ua/soa/soa_static.c
+++ b/libs/sofia-sip/libsofia-sip-ua/soa/soa_static.c
@@ -1117,6 +1117,8 @@ static int offer_answer_step(soa_session_t *ss,
 
   if (action == generate_offer)
     remote = NULL;
+  else if (remote == NULL)
+    return soa_set_status(ss, 500, "No remote SDP");
 
   /* Pre-negotiation Step: Expand truncated remote SDP */
   if (local && remote) switch (action) {
@@ -1127,6 +1129,8 @@ static int offer_answer_step(soa_session_t *ss,
       SU_DEBUG_5(("%s: remote %s is truncated: expanding\n",
                  by, action == generate_answer ? "offer" : "answer"));
       remote = soa_sdp_expand_media(tmphome, remote, local);
+      if (remote == NULL)
+       return soa_set_status(ss, 500, "Cannot expand remote session");
     }
   default:
     break;