Commit a89f96d8 authored by Pavlov Konstantin's avatar Pavlov Konstantin

Port some fixes from CVE-2008-0225 fix for xine-lib plus some code style...

Port some fixes from CVE-2008-0225 fix for xine-lib plus some code style fixes. Someone should really review it as it may be not fully fixed.
parent ce68b58c
This diff is collapsed.
...@@ -29,6 +29,12 @@ ...@@ -29,6 +29,12 @@
#define RMFF_HEADER_SIZE 0x12 #define RMFF_HEADER_SIZE 0x12
#define RMFF_FILEHEADER_SIZE 18
#define RMFF_PROPHEADER_SIZE 50
#define RMFF_MDPRHEADER_SIZE 46
#define RMFF_CONTHEADER_SIZE 18
#define RMFF_DATAHEADER_SIZE 18
#define FOURCC_TAG( ch0, ch1, ch2, ch3 ) \ #define FOURCC_TAG( ch0, ch1, ch2, ch3 ) \
(((long)(unsigned char)(ch3) ) | \ (((long)(unsigned char)(ch3) ) | \
( (long)(unsigned char)(ch2) << 8 ) | \ ( (long)(unsigned char)(ch2) << 8 ) | \
...@@ -234,7 +240,7 @@ int rmff_get_header_size(rmff_header_t *h); ...@@ -234,7 +240,7 @@ int rmff_get_header_size(rmff_header_t *h);
/* /*
* dumps the header <h> to <buffer>. <max> is the size of <buffer> * dumps the header <h> to <buffer>. <max> is the size of <buffer>
*/ */
int rmff_dump_header(rmff_header_t *h, char *buffer, int max); int rmff_dump_header(rmff_header_t *h, void *buffer, int max);
/* /*
* dumps a packet header * dumps a packet header
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment