diff options
| author | bbryant <bbryant@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-06-18 20:08:45 +0000 |
|---|---|---|
| committer | bbryant <bbryant@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-06-18 20:08:45 +0000 |
| commit | c50963abdcc8f96704ac5135777a3e465b5603e7 (patch) | |
| tree | 6bc0367cbce5884b103f8cebd075605cb4a8203e /main/tcptls.c | |
| parent | fdd3e19562cfec77161a5e0a598939f112e5634d (diff) | |
Merged revisions 123692 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r123692 | bbryant | 2008-06-18 15:07:56 -0500 (Wed, 18 Jun 2008) | 2 lines
Fix a crash in tcp and tls connections related to reference counts.
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@123693 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/tcptls.c')
| -rw-r--r-- | main/tcptls.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/main/tcptls.c b/main/tcptls.c index 9ce3ac9b8..f51a44701 100644 --- a/main/tcptls.c +++ b/main/tcptls.c @@ -276,6 +276,7 @@ struct ast_tcptls_session_instance *ast_tcptls_client_start(struct server_args * __ssl_setup(desc->tls_cfg, 1); } + ao2_ref(ser, +1); if (!ast_make_file_from_fd(ser)) goto error; @@ -460,7 +461,7 @@ void *ast_make_file_from_fd(void *data) if (!ser->f) { close(ser->fd); ast_log(LOG_WARNING, "FILE * open failed!\n"); - ast_free(ser); + ao2_ref(ser, -1); return NULL; } |