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

rtcpbuffer: fix function guards with side effects

Browse source 
Code in g_return_*() must not have side effects, as it
might be compiled out if -DG_DISABLE_CHECKS is used, in
which case we would read garbage off the stack.
This commit is contained in:
Tim-Philipp Müller 2018-12-30 17:26:04 +00:00
parent 56688ce078
commit 44b18ea2b6
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
gst-libs/gst/rtp/gstrtcpbuffer.c
View file

@ -2822,8 +2822,9 @@ gst_rtcp_packet_xr_get_rle_nth_chunk (GstRTCPPacket * packet,
guint32 chunk_count; guint32 chunk_count;
guint8 *data; guint8 *data;
g_return_val_if_fail (gst_rtcp_packet_xr_get_rle_info (packet, NULL, NULL, if (!gst_rtcp_packet_xr_get_rle_info (packet, NULL, NULL, NULL, NULL,
NULL, NULL, &chunk_count), FALSE); &chunk_count))
g_return_val_if_reached (FALSE);
if (nth >= chunk_count) if (nth >= chunk_count)
return FALSE; return FALSE;
@ -2917,8 +2918,9 @@ gst_rtcp_packet_xr_get_prt_by_seq (GstRTCPPacket * packet,
guint16 begin_seq, end_seq; guint16 begin_seq, end_seq;
guint8 *data; guint8 *data;
g_return_val_if_fail (gst_rtcp_packet_xr_get_prt_info (packet, NULL, NULL, if (!gst_rtcp_packet_xr_get_prt_info (packet, NULL, NULL, &begin_seq,
&begin_seq, &end_seq), FALSE); &end_seq))
g_return_val_if_reached (FALSE);
if (seq >= end_seq || seq < begin_seq) if (seq >= end_seq || seq < begin_seq)
return FALSE; return FALSE;