mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-23 10:11:08 +00:00
Add buffer length checks to every typefinding function
Original commit message from CVS: Add buffer length checks to every typefinding function
This commit is contained in:
parent
a287b1e442
commit
a962c0f40c
7 changed files with 28 additions and 5 deletions
|
@ -58,7 +58,7 @@ gst_aftypes_type_find(GstBuffer *buf, gpointer private)
|
|||
int file_format, format_version;
|
||||
gchar *type;
|
||||
|
||||
g_print("calling gst_aftypes_type_find\n");
|
||||
GST_DEBUG("calling gst_aftypes_type_find");
|
||||
|
||||
buffer_wrap->buffer = buf;
|
||||
buffer_wrap->offset = 0;
|
||||
|
@ -76,7 +76,7 @@ gst_aftypes_type_find(GstBuffer *buf, gpointer private)
|
|||
file_format = afGetFileFormat (file, &format_version);
|
||||
afCloseFile (file);
|
||||
|
||||
g_print("file format: %d\n", file_format);
|
||||
GST_DEBUG("file format: %d", file_format);
|
||||
|
||||
/* reject raw data, just in case it is some other format */
|
||||
if (file_format == AF_FILE_UNKNOWN ||
|
||||
|
|
|
@ -83,7 +83,12 @@ static GstTypeDefinition vorbisdefinition = {
|
|||
static GstCaps*
|
||||
vorbis_type_find (GstBuffer *buf, gpointer private)
|
||||
{
|
||||
guint32 head = GUINT32_FROM_BE (*((guint32 *)GST_BUFFER_DATA (buf)));
|
||||
guint32 head;
|
||||
|
||||
if (GST_BUFFER_SIZE (buf) < 4)
|
||||
return NULL;
|
||||
|
||||
head = GUINT32_FROM_BE (*((guint32 *)GST_BUFFER_DATA (buf)));
|
||||
|
||||
if (head != 0x4F676753)
|
||||
return NULL;
|
||||
|
|
|
@ -631,6 +631,9 @@ swf_type_find(GstBuffer *buf, gpointer private)
|
|||
{
|
||||
gchar *data = GST_BUFFER_DATA(buf);
|
||||
|
||||
if (GST_BUFFER_SIZE (buf) < 4)
|
||||
return NULL;
|
||||
|
||||
if((data[0] != 'F' && data[0] != 'C') ||
|
||||
data[1] != 'W' || data[2] != 'S')return NULL;
|
||||
|
||||
|
|
|
@ -69,11 +69,16 @@ static GstTypeDefinition tarkindefinition =
|
|||
static GstCaps*
|
||||
tarkin_type_find (GstBuffer *buf, gpointer private)
|
||||
{
|
||||
guint32 head = GUINT32_FROM_BE (*((guint32 *)GST_BUFFER_DATA (buf)));
|
||||
guint32 head;
|
||||
|
||||
if (GST_BUFFER_SIZE (buf) < 4)
|
||||
return NULL;
|
||||
|
||||
/* FIXME */
|
||||
return NULL;
|
||||
|
||||
head = GUINT32_FROM_BE (*((guint32 *)GST_BUFFER_DATA (buf)));
|
||||
|
||||
if (head != 0x4F676753)
|
||||
return NULL;
|
||||
|
||||
|
|
|
@ -167,6 +167,9 @@ cdxa_type_find (GstBuffer *buf,
|
|||
|
||||
GST_DEBUG ("cdxa_parse: typefind");
|
||||
|
||||
if (GST_BUFFER_SIZE (buf) < 12)
|
||||
return NULL;
|
||||
|
||||
if (GUINT32_FROM_LE (((guint32 *)data)[0]) != GST_RIFF_TAG_RIFF)
|
||||
return NULL;
|
||||
if (GUINT32_FROM_LE (((guint32 *)data)[2]) != GST_RIFF_RIFF_CDXA)
|
||||
|
|
|
@ -203,8 +203,12 @@ text_type_find (GstBuffer *buf, gpointer private)
|
|||
gchar *data = GST_BUFFER_DATA (buf);
|
||||
gint i;
|
||||
|
||||
/* 20 is arbitrary. 4 is definitely too small. */
|
||||
if (GST_BUFFER_SIZE (buf) < 20)
|
||||
return NULL;
|
||||
|
||||
for (i=0; i<GST_BUFFER_SIZE (buf); i++) {
|
||||
if (!isprint(*(data+i)))
|
||||
if (!isprint(data[i]) && data[i]!='\n')
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
|
|
@ -132,6 +132,9 @@ static GstElementClass *parent_class = NULL;
|
|||
static GstCaps*
|
||||
modplug_type_find (GstBuffer *buf, gpointer priv)
|
||||
{
|
||||
if (GST_BUFFER_SIZE (buf) < 75)
|
||||
return NULL;
|
||||
|
||||
if (MOD_CheckType (buf) ||
|
||||
Mod_669_CheckType (buf) ||
|
||||
Amf_CheckType (buf) ||
|
||||
|
|
Loading…
Reference in a new issue