mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-24 17:20:36 +00:00
Code Issues 1 Projects Releases Wiki Activity

dcaparse: Really fix "usage before unmap"

Browse source 
Previous patch would try to unref a buffer that was pushed downstream.

Instead only unref when/if needed and keep usage of the cleanup: goto
block
This commit is contained in:
Edward Hervey 2017-09-04 17:06:39 +02:00 committed by Edward Hervey
parent 5cf368b36c
commit 5bc5e07531
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
gst/audioparsers/gstdcaparse.c
View file

@ -446,6 +446,7 @@ gst_dca_parse_handle_frame (GstBaseParse * parse,
gst_base_parse_set_frame_rate (parse, rate, block_size, 0, 0); gst_base_parse_set_frame_rate (parse, rate, block_size, 0, 0);
} }
cleanup:
/* it is possible that DTS HD substream after DTS core */ /* it is possible that DTS HD substream after DTS core */
if (parse->flags & GST_BASE_PARSE_FLAG_DRAINING || map.size >= size + 9) { if (parse->flags & GST_BASE_PARSE_FLAG_DRAINING || map.size >= size + 9) {
extra_size = 0; extra_size = 0;
@ -469,18 +470,16 @@ gst_dca_parse_handle_frame (GstBaseParse * parse,
} }
} }
} }
gst_buffer_unmap (buf, &map);
if (ret == GST_FLOW_OK && size + extra_size <= map.size) { if (ret == GST_FLOW_OK && size + extra_size <= map.size) {
ret = gst_base_parse_finish_frame (parse, frame, size + extra_size); ret = gst_base_parse_finish_frame (parse, frame, size + extra_size);
} else { } else {
ret = GST_FLOW_OK; ret = GST_FLOW_OK;
} }
} else { } else {
ret = GST_FLOW_OK; gst_buffer_unmap (buf, &map);
} }
cleanup:
gst_buffer_unmap (buf, &map);
return ret; return ret;
} }