diff options
| author | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-06-06 17:50:05 +0000 |
|---|---|---|
| committer | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-06-06 17:50:05 +0000 |
| commit | 60bf6d123af52f5efe12725ae5924cf244284929 (patch) | |
| tree | 363a71ee561056de973774f2510fb94e89f3b24c /main | |
| parent | d7d5ebe84a078e4c5fe422411f6caddb4888ea3f (diff) | |
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: http://svn.digium.com/svn/asterisk/trunk@120906 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/features.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/main/features.c b/main/features.c index 2daa14426..4b281bf86 100644 --- 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) |