marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

d3dxof: Add missing checks for remaining bytes during parsing.

oldstable
Dylan Smith 2011-04-20 16:20:01 -04:00 committed by Alexandre Julliard
parent 18b8f951bf
commit 555fe78766
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dlls/d3dxof/parsing.c
View File

@ -337,7 +337,7 @@ static BOOL is_guid(parse_buffer* buf)
DWORD tab[10];
int ret;
if (*buf->buffer != '<')
if (buf->rem_bytes < 38 || *buf->buffer != '<')
return FALSE;
tmp[0] = '<';
while (*(buf->buffer+pos) != '>')
@ -385,7 +385,7 @@ static BOOL is_name(parse_buffer* buf)
DWORD pos = 0;
char c;
BOOL error = 0;
while (!is_separator(c = *(buf->buffer+pos)))
while (pos < buf->rem_bytes && !is_separator(c = *(buf->buffer+pos)))
{
if (!(((c >= 'a') && (c <= 'z')) || ((c >= 'A') && (c <= 'Z')) || ((c >= '0') && (c <= '9')) || (c == '_') || (c == '-')))
error = 1;
@ -416,7 +416,7 @@ static BOOL is_float(parse_buffer* buf)
float decimal;
BOOL dot = 0;
while (!is_separator(c = *(buf->buffer+pos)))
while (pos < buf->rem_bytes && !is_separator(c = *(buf->buffer+pos)))
{
if (!((!pos && (c == '-')) || ((c >= '0') && (c <= '9')) || (!dot && (c == '.'))))
return FALSE;
@ -445,7 +445,7 @@ static BOOL is_integer(parse_buffer* buf)
char c;
DWORD integer;
while (!is_separator(c = *(buf->buffer+pos)))
while (pos < buf->rem_bytes && !is_separator(c = *(buf->buffer+pos)))
{
if (!((c >= '0') && (c <= '9')))
return FALSE;
@ -475,7 +475,7 @@ static BOOL is_string(parse_buffer* buf)
if (*buf->buffer != '"')
return FALSE;
while (!is_operator(c = *(buf->buffer+pos+1)) && (pos < 99))
while (pos < buf->rem_bytes && !is_operator(c = *(buf->buffer+pos+1)) && (pos < 99))
{
if (c == '"')
{