diff options
| author | Corey Farrell <git@cfware.com> | 2016-01-07 10:39:19 -0500 |
|---|---|---|
| committer | Corey Farrell <git@cfware.com> | 2016-01-07 10:51:26 -0600 |
| commit | 52e9de001688025669eff569be69b4c9c9191bf5 (patch) | |
| tree | 3ea3d73fc275680fd9837c2c5312c0f53a35f372 /main/format_cap.c | |
| parent | eb3d083551b45e08b2aa8bf3bf876ae69ad16b4d (diff) | |
ast_format_cap_append_by_type: Resolve codec reference leak.
This resolves a reference leak caused by ASTERISK-25535. The pointer
returned by ast_format_get_codec is saved so it can be released.
ASTERISK-25664 #close
Change-Id: If9941b1bf4320b2c59056546d6bce9422726d1ec
Diffstat (limited to 'main/format_cap.c')
| -rw-r--r-- | main/format_cap.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/main/format_cap.c b/main/format_cap.c index 8d6046ab2..17ae18cd4 100644 --- a/main/format_cap.c +++ b/main/format_cap.c @@ -252,6 +252,7 @@ int ast_format_cap_append_by_type(struct ast_format_cap *cap, enum ast_media_typ for (id = 1; id < ast_codec_get_max(); ++id) { struct ast_codec *codec = ast_codec_get_by_id(id); + struct ast_codec *codec2 = NULL; struct ast_format *format; int res; @@ -272,10 +273,14 @@ int ast_format_cap_append_by_type(struct ast_format_cap *cap, enum ast_media_typ continue; } - if (!format || (codec != ast_format_get_codec(format))) { + if (format) { + codec2 = ast_format_get_codec(format); + } + if (codec != codec2) { ao2_cleanup(format); format = ast_format_create(codec); } + ao2_cleanup(codec2); ao2_ref(codec, -1); if (!format) { |