mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 12:11:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

legacyh264parse: check for out of range pps_id one layer up

Browse source 
Fixes compiler warning comparing guint8 and MAX_PPS_COUNT which is > G_MAXUINT8
This commit is contained in:
Alessandro Decina 2011-05-29 12:54:40 +02:00
parent 2e610eb003
commit c07424ea4e
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
gst/h264parse/gsth264parse.c
View file

@ -358,10 +358,7 @@ gst_h264_parse_get_pps (GstH264Parse * h, guint8 pps_id)
{ {
GstH264Pps *pps; GstH264Pps *pps;
g_return_val_if_fail (h != NULL, NULL); g_return_val_if_fail (h != NULL, NULL);
if (pps_id >= MAX_PPS_COUNT) {
GST_DEBUG_OBJECT (h, "requested pps_id=%04x out of range", pps_id);
return NULL;
}
pps = h->pps_buffers[pps_id]; pps = h->pps_buffers[pps_id];
if (pps == NULL) { if (pps == NULL) {
GST_DEBUG_OBJECT (h, "Creating pps with pps_id=%04x", pps_id); GST_DEBUG_OBJECT (h, "Creating pps with pps_id=%04x", pps_id);
@ -665,10 +662,15 @@ gst_nal_decode_sps (GstH264Parse * h, GstNalBs * bs)
static gboolean static gboolean
gst_nal_decode_pps (GstH264Parse * h, GstNalBs * bs) gst_nal_decode_pps (GstH264Parse * h, GstNalBs * bs)
{ {
guint8 pps_id; gint pps_id;
GstH264Pps *pps = NULL; GstH264Pps *pps = NULL;
pps_id = gst_nal_bs_read_ue (bs); pps_id = gst_nal_bs_read_ue (bs);
if (pps_id >= MAX_PPS_COUNT) {
GST_DEBUG_OBJECT (h, "requested pps_id=%04x out of range", pps_id);
return FALSE;
}
pps = gst_h264_parse_get_pps (h, pps_id); pps = gst_h264_parse_get_pps (h, pps_id);
if (pps == NULL) { if (pps == NULL) {
return FALSE; return FALSE;