merge anthm fix for atoi(NULL) segfault. Thanks jart for identifying the problem.

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

diff --git a/src/include/switch.h b/src/include/switch.h
index 9dabea2a9af738e7720b1c8ee25b5be718a41d5b..47d6ab3e225b85125ceea4a2ee856fe6274bb719 100644 (file)
--- a/src/include/switch.h
+++ b/src/include/switch.h
@@ -101,7 +101,6 @@ END_EXTERN_C
  *     Additionally, the experimental external modules make use of several external modules:
  *
  *     mod_Exosip:
- *             - JRTPlib (http://research.edm.luc.ac.be/jori/jrtplib/jrtplib.html)
  *             - eXoSIP (http://savannah.nongnu.org/projects/exosip/)
  *
  *     mod_iaxchan:

diff --git a/src/mod/endpoints/mod_exosip/mod_exosip.c b/src/mod/endpoints/mod_exosip/mod_exosip.c
index a5c7de602842f6659f586780062ea5f2deafa968..44901048bfe573ce31fe3d2979b36cc30975cea4 100644 (file)
--- a/src/mod/endpoints/mod_exosip/mod_exosip.c
+++ b/src/mod/endpoints/mod_exosip/mod_exosip.c
@@ -1575,8 +1575,11 @@ static void handle_message_new(eXosip_event_t *je)
                                }
 
 
-                               expires = get_header_value(je, "expires");
-                               exptime = time(NULL) + atoi(expires) + 20;
+                               if ((expires = get_header_value(je, "expires"))) {
+                                       exptime = time(NULL) + atoi(expires) + 20;
+                               } else {
+                                       exptime = time(NULL) + 3600;
+                               }
 
                                
                                if (!find_reg_url(globals.db, je->request->from->url->username, sql, sizeof(sql))) {