]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
streams: Fix one memory leak and one formats ref issue
authorGeorge Joseph <gjoseph@digium.com>
Mon, 4 May 2020 16:31:57 +0000 (10:31 -0600)
committerFriendly Automation <jenkins2@gerrit.asterisk.org>
Wed, 6 May 2020 12:27:49 +0000 (07:27 -0500)
ast_stream_topology_create_from_format_cap() was setting the
stream->formats directly but not freeing the default formats.  This
causes a memory leak.

* ast_stream_topology_create_from_format_cap() now calls
  ast_stream_set_formats() which properly cleans up the existing
  stream formats.

When cloning a stream, the source stream's format caps _pointer_ is
copied to the new stream and it's reference count bumped.  If
either stream is set to "removed", this will cause _both_ streams
to have their format caps cleared.

* ast_stream_clone() now creates a new format caps object and copies
  the formats from the source stream instead of just copying the
  pointer.

ASTERISK-28870

Change-Id: If697d81c3658eb7baeea6dab413b13423938fb53

main/stream.c

index 02e6a548fe9d05447c1bcbad526d796fcf7f1bb3..21dcede633a6772284ac4f6c36debe20c88cfea9 100644 (file)
@@ -137,9 +137,13 @@ struct ast_stream *ast_stream_clone(const struct ast_stream *stream, const char
        memcpy(new_stream, stream, sizeof(*new_stream));
        strcpy(new_stream->name, stream_name); /* Safe */
        new_stream->group = -1;
-       if (new_stream->formats) {
-               ao2_ref(new_stream->formats, +1);
+
+       new_stream->formats = ast_format_cap_alloc(AST_FORMAT_CAP_FLAG_DEFAULT);
+       if (!new_stream->formats) {
+               ast_free(new_stream);
+               return NULL;
        }
+       ast_format_cap_append_from_cap(new_stream->formats, stream->formats, AST_MEDIA_TYPE_UNKNOWN);
 
        new_stream->metadata = ast_stream_get_metadata_list(stream);
 
@@ -585,8 +589,9 @@ struct ast_stream_topology *ast_stream_topology_create_from_format_cap(
                        ast_stream_topology_free(topology);
                        return NULL;
                }
-               /* We're transferring the initial ref so no bump needed */
-               stream->formats = new_cap;
+
+               ast_stream_set_formats(stream, new_cap);
+               ao2_ref(new_cap, -1);
                stream->state = AST_STREAM_STATE_SENDRECV;
                if (ast_stream_topology_append_stream(topology, stream) == -1) {
                        ast_stream_free(stream);