mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-26 00:58:12 +00:00
Code Issues 1 Projects Releases Wiki Activity

rtph263pay: fix leak

Browse source 
Free memory of current macroblock once it isn't needed so it isn't leaked
by the call of the gst_rtp_h263_pay_B_mbfinder function.
if (!(mac = gst_rtp_h263_pay_B_mbfinder (context, gob, mac, mb))) {

CID 1212156
This commit is contained in:
Luis de Bethencourt 2016-03-31 14:57:20 +01:00
parent 41d2b6f19e
commit 6a16be75bf
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gst/rtp/gstrtph263pay.c
View file

@ -952,19 +952,16 @@ static GstRtpH263PayMB *
gst_rtp_h263_pay_B_mbfinder (GstRtpH263PayContext * context, gst_rtp_h263_pay_B_mbfinder (GstRtpH263PayContext * context,
GstRtpH263PayGob * gob, GstRtpH263PayMB * macroblock, guint mba) GstRtpH263PayGob * gob, GstRtpH263PayMB * macroblock, guint mba)
{ {
guint mb_type_index; guint mb_type_index;
guint cbpy_type_index; guint cbpy_type_index;
guint tcoef_type_index; guint tcoef_type_index;
GstRtpH263PayMB *mac; GstRtpH263PayMB *mac;
GstRtpH263PayBoundry boundry; GstRtpH263PayBoundry boundry;
gst_rtp_h263_pay_boundry_init (&boundry, macroblock->end, gst_rtp_h263_pay_boundry_init (&boundry, macroblock->end,
macroblock->end, 8 - macroblock->ebit, macroblock->ebit); macroblock->end, 8 - macroblock->ebit, macroblock->ebit);
mac = gst_rtp_h263_pay_mb_new (&boundry, mba); mac = gst_rtp_h263_pay_mb_new (&boundry, mba);
if (mac->sbit == 8) { if (mac->sbit == 8) {
mac->start++; mac->start++;
// mac->end++; // mac->end++;
@ -974,6 +971,9 @@ gst_rtp_h263_pay_B_mbfinder (GstRtpH263PayContext * context,
GST_LOG ("current_pos:%p, end:%p, rest_bits:%d, window:%x", GST_LOG ("current_pos:%p, end:%p, rest_bits:%d, window:%x",
mac->start, mac->end, macroblock->ebit, context->window); mac->start, mac->end, macroblock->ebit, context->window);
/* macroblock isn't needed anymore */
gst_rtp_h263_pay_mb_destroy (macroblock);
GST_LOG ("Current pos after COD: %p", mac->end); GST_LOG ("Current pos after COD: %p", mac->end);
if (context->piclayer->ptype_pictype == 0) { if (context->piclayer->ptype_pictype == 0) {
@ -1225,7 +1225,6 @@ gst_rtp_h263_pay_B_mbfinder (GstRtpH263PayContext * context,
return mac; return mac;
beach: beach:
gst_rtp_h263_pay_mb_destroy (mac);
return NULL; return NULL;
} }
@ -1589,7 +1588,6 @@ gst_rtp_h263_pay_mode_B_fragment (GstRtpH263Pay * rtph263pay,
} }
/*---------- END OF MODE B FRAGMENTATION ----------*/ /*---------- END OF MODE B FRAGMENTATION ----------*/
gst_rtp_h263_pay_mb_destroy (mac); gst_rtp_h263_pay_mb_destroy (mac);
return TRUE; return TRUE;