diff options
| author | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-03-11 03:25:04 +0000 |
|---|---|---|
| committer | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-03-11 03:25:04 +0000 |
| commit | d16c3fd4ca7637d33efa163106630a4110f7a448 (patch) | |
| tree | 0cd32982e8825620c5d5bf61f85e3830118f357f /res | |
| parent | 8e1667bc2d6b310744333ee2e30fd331fd66c70d (diff) | |
Fix malloc debug macros to work properly with h323.
The main problem here was that cstdlib was undefining free thereby causing the
proper debug macros to not be used. ast_h323.cxx has been changed to call
ast_free instead to avoid the issue. Because using the ast prefix calls are
a better choice, ast_free_ptr is the new wrapper for free to pass to functions.
Also, a little bit of clean up was done to avoid the debug macros intentionally
being redefined.
(closes issue #13593)
Reported by: pj
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@181133 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res')
| -rw-r--r-- | res/res_features.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/res/res_features.c b/res/res_features.c index cbdd57aaa..df4c7d300 100644 --- a/res/res_features.c +++ b/res/res_features.c @@ -518,7 +518,7 @@ static int park_call_full(struct ast_channel *chan, struct ast_channel *peer, in if (!con) /* Still no context? Bad */ ast_log(LOG_ERROR, "Parking context '%s' does not exist and unable to create\n", parking_con); if (con) { - if (!ast_add_extension2(con, 1, pu->parkingexten, 1, NULL, NULL, parkedcall, strdup(pu->parkingexten), ast_free, registrar)) { + if (!ast_add_extension2(con, 1, pu->parkingexten, 1, NULL, NULL, parkedcall, strdup(pu->parkingexten), ast_free_ptr, registrar)) { notify_metermaids(pu->parkingexten, parking_con); } } @@ -2195,7 +2195,7 @@ static void *do_parking_thread(void *ignore) snprintf(returnexten, sizeof(returnexten), "%s|30|t", peername); } - ast_add_extension2(con, 1, peername, 1, NULL, NULL, "Dial", strdup(returnexten), ast_free, registrar); + ast_add_extension2(con, 1, peername, 1, NULL, NULL, "Dial", strdup(returnexten), ast_free_ptr, registrar); } set_c_e_p(chan, parking_con_dial, peername, 1); } else { |