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

audio: Extend guards in functions to also cover negative/unknown out of bounds DSD formats

Browse source 
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4966>
This commit is contained in:
Sebastian Dröge 2023-07-05 09:26:46 +03:00 committed by GStreamer Marge Bot
parent 6b47a37ed8
commit 44ffb80a32
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
subprojects/gst-plugins-base/gst-libs/gst/audio/gstdsd.c
View file

@ -581,7 +581,8 @@ gst_dsd_info_to_caps (const GstDsdInfo * info)
GstAudioFlags flags; GstAudioFlags flags;
g_return_val_if_fail (info != NULL, NULL); g_return_val_if_fail (info != NULL, NULL);
g_return_val_if_fail (info->format < GST_NUM_DSD_FORMATS, NULL); g_return_val_if_fail (info->format > GST_DSD_FORMAT_UNKNOWN
&& info->format < GST_NUM_DSD_FORMATS, NULL);
g_return_val_if_fail (info->rate >= 1, NULL); g_return_val_if_fail (info->rate >= 1, NULL);
g_return_val_if_fail (info->channels >= 1, NULL); g_return_val_if_fail (info->channels >= 1, NULL);
@ -1002,8 +1003,10 @@ gst_dsd_convert (const guint8 * input_data, guint8 * output_data,
{ {
g_return_if_fail (input_data != NULL); g_return_if_fail (input_data != NULL);
g_return_if_fail (output_data != NULL); g_return_if_fail (output_data != NULL);
g_return_if_fail (input_format < GST_NUM_DSD_FORMATS); g_return_if_fail (input_format > GST_DSD_FORMAT_UNKNOWN
g_return_if_fail (output_format < GST_NUM_DSD_FORMATS); && input_format < GST_NUM_DSD_FORMATS);
g_return_if_fail (output_format > GST_DSD_FORMAT_UNKNOWN
&& output_format < GST_NUM_DSD_FORMATS);
g_return_if_fail (input_layout == GST_AUDIO_LAYOUT_INTERLEAVED g_return_if_fail (input_layout == GST_AUDIO_LAYOUT_INTERLEAVED
|| input_plane_offsets != NULL); || input_plane_offsets != NULL);
g_return_if_fail (output_layout == GST_AUDIO_LAYOUT_INTERLEAVED g_return_if_fail (output_layout == GST_AUDIO_LAYOUT_INTERLEAVED