Merged revisions 120863,120885 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r120863 | jpeeler | 2008-06-06 10:33:15 -0500 (Fri, 06 Jun 2008) | 3 lines

This fixes a crash when LOW_MEMORY is turned on. Two allocations of the ast_rtp struct that were previously allocated on the stack have been modified to use thread local storage instead.

........
r120885 | jpeeler | 2008-06-06 11:39:20 -0500 (Fri, 06 Jun 2008) | 2 lines

Correction to commmit 120863, make sure proper destructor function is called as well define two thread storage local variables.

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@120906 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index b8e69520014ffb23fc10a074cdf0cf649d92391c..6c31e395c462314ca513c20a465f7eda6e91db99 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -1723,6 +1723,12 @@ static void temp_pvt_cleanup(void *);
 /*! \brief A per-thread temporary pvt structure */
 AST_THREADSTORAGE_CUSTOM(ts_temp_pvt, temp_pvt_init, temp_pvt_cleanup);
 
+static void ts_ast_rtp_destroy(void *);
+
+AST_THREADSTORAGE_CUSTOM(ts_audio_rtp, NULL, ts_ast_rtp_destroy);
+AST_THREADSTORAGE_CUSTOM(ts_video_rtp, NULL, ts_ast_rtp_destroy);
+AST_THREADSTORAGE_CUSTOM(ts_text_rtp, NULL, ts_ast_rtp_destroy);
+
 /*! \brief Authentication list for realm authentication 
  * \todo Move the sip_auth list to AST_LIST */
 static struct sip_auth *authl = NULL;
@@ -6685,17 +6691,29 @@ static int process_sdp(struct sip_pvt *p, struct sip_request *req, int t38action
        }
 
        /* Initialize the temporary RTP structures we use to evaluate the offer from the peer */
+#ifdef LOW_MEMORY
+       newaudiortp = ast_threadstorage_get(&ts_audio_rtp, ast_rtp_alloc_size());
+#else
        newaudiortp = alloca(ast_rtp_alloc_size());
+#endif
        memset(newaudiortp, 0, ast_rtp_alloc_size());
        ast_rtp_new_init(newaudiortp);
        ast_rtp_pt_clear(newaudiortp);
 
+#ifdef LOW_MEMORY
+       newvideortp = ast_threadstorage_get(&ts_video_rtp, ast_rtp_alloc_size());
+#else
        newvideortp = alloca(ast_rtp_alloc_size());
+#endif
        memset(newvideortp, 0, ast_rtp_alloc_size());
        ast_rtp_new_init(newvideortp);
        ast_rtp_pt_clear(newvideortp);
 
+#ifdef LOW_MEMORY
+       newtextrtp = ast_threadstorage_get(&ts_text_rtp, ast_rtp_alloc_size());
+#else
        newtextrtp = alloca(ast_rtp_alloc_size());
+#endif
        memset(newtextrtp, 0, ast_rtp_alloc_size());
        ast_rtp_new_init(newtextrtp);
        ast_rtp_pt_clear(newtextrtp);
@@ -7364,6 +7382,11 @@ static int process_sdp(struct sip_pvt *p, struct sip_request *req, int t38action
        return 0;
 }
 
+static void ts_ast_rtp_destroy(void *data)
+{
+    struct ast_rtp *tmp = data;
+    ast_rtp_destroy(tmp);
+}
 
 /*! \brief Add header to SIP message */
 static int add_header(struct sip_request *req, const char *var, const char *value)

diff --git a/main/features.c b/main/features.c
index 2daa14426643a0be7d33b0e6584879f43bef3226..4b281bf8657b04a57cc0dd77be464f452ee9d01e 100644 (file)
--- a/main/features.c
+++ b/main/features.c
@@ -464,11 +464,12 @@ static int ast_park_call_full(struct ast_channel *chan, struct ast_channel *peer
        struct parkeduser *pu;
        int i, x = -1, parking_range;
        struct ast_context *con;
-       const char *parkinglotname;
+       const char *parkinglotname = NULL;
        const char *parkingexten;
        struct ast_parkinglot *parkinglot = NULL;
        
-       parkinglotname = findparkinglotname(peer);
+       if (peer)
+               parkinglotname = findparkinglotname(peer);
 
        if (parkinglotname) {
                if (option_debug)