diff options
| author | Corey Farrell <git@cfware.com> | 2016-07-13 12:30:58 -0400 |
|---|---|---|
| committer | Corey Farrell <git@cfware.com> | 2016-07-13 12:30:58 -0400 |
| commit | 672a64bda3142a162f7c458ce7df2896805e9a1f (patch) | |
| tree | 1a1105f414f66bf02b78a9e6a16916702962dd92 | |
| parent | 8cea01ab1b3e07282487d7efe1888f290cc4280a (diff) | |
threadpool: Fix leak in ast_threadpool_serializer_group error path.
ast_threadpool_serializer_group leaks a reference to ser when listener
is allocated but tps is not. Although listener takes the reference to
ser cleanup functions are not run without tps.
ASTERISK-26191 #close
Change-Id: Ie3ccf69a3f1e676c2ef62a77067c0cb57dc9a585
| -rw-r--r-- | main/threadpool.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/main/threadpool.c b/main/threadpool.c index 9cd33ab1a..6240b7329 100644 --- a/main/threadpool.c +++ b/main/threadpool.c @@ -1384,10 +1384,12 @@ struct ast_taskprocessor *ast_threadpool_serializer_group(const char *name, ao2_ref(ser, -1); return NULL; } - /* ser ref transferred to listener */ tps = ast_taskprocessor_create_with_listener(name, listener); - if (tps && shutdown_group) { + if (!tps) { + /* ser ref transferred to listener but not cleaned without tps */ + ao2_ref(ser, -1); + } else if (shutdown_group) { serializer_shutdown_group_inc(shutdown_group); } |