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

quartz: Fix hex digit checks in process_pattern_string. 

Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
feature/deterministic
Jacek Caban 2020-02-06 14:00:29 +01:00 committed by Alexandre Julliard
parent 6e8c2d836e
commit bf95bccfaf
1 changed files with 14 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
dlls/quartz/filesource.c
View File

@ -87,37 +87,19 @@ static inline AsyncReader *impl_from_IFileSourceFilter(IFileSourceFilter *iface)
static const IFileSourceFilterVtbl FileSource_Vtbl;
static const IAsyncReaderVtbl FileAsyncReader_Vtbl;
static unsigned char byte_from_hex_char(WCHAR wHex)
static int byte_from_hex_char(WCHAR c)
{
switch (towlower(wHex))
{
case '0':
case '1':
case '2':
case '3':
case '4':
case '5':
case '6':
case '7':
case '8':
case '9':
return (wHex - '0') & 0xf;
case 'a':
case 'b':
case 'c':
case 'd':
case 'e':
case 'f':
return (wHex - 'a' + 10) & 0xf;
default:
return 0;
}
if ('0' <= c && c <= '9') return c - '0';
if ('a' <= c && c <= 'f') return c - 'a' + 10;
if ('A' <= c && c <= 'F') return c - 'A' + 10;
return -1;
}
static BOOL process_pattern_string(const WCHAR *pattern, HANDLE file)
{
ULONG size, offset, i, ret_size;
BYTE *mask, *expect, *actual;
int d;
BOOL ret = TRUE;
/* format: "offset, size, mask, value" */
@ -140,15 +122,15 @@ static BOOL process_pattern_string(const WCHAR *pattern, HANDLE file)
return FALSE;
}
pattern++;
while (!iswxdigit(*pattern) && (*pattern != ','))
while (byte_from_hex_char(*pattern) == -1 && (*pattern != ','))
pattern++;
for (i = 0; iswxdigit(*pattern) && (i/2 < size); pattern++, i++)
for (i = 0; (d = byte_from_hex_char(*pattern)) != -1 && (i/2 < size); pattern++, i++)
{
if (i % 2)
mask[i / 2] |= byte_from_hex_char(*pattern);
mask[i / 2] |= d;
else
mask[i / 2] = byte_from_hex_char(*pattern) << 4;
mask[i / 2] = d << 4;
}
if (!(pattern = wcschr(pattern, ',')))
@ -158,15 +140,15 @@ static BOOL process_pattern_string(const WCHAR *pattern, HANDLE file)
return FALSE;
}
pattern++;
while (!iswxdigit(*pattern) && (*pattern != ','))
while (byte_from_hex_char(*pattern) == -1 && (*pattern != ','))
pattern++;
for (i = 0; iswxdigit(*pattern) && (i/2 < size); pattern++, i++)
for (i = 0; (d = byte_from_hex_char(*pattern)) != -1 && (i/2 < size); pattern++, i++)
{
if (i % 2)
expect[i / 2] |= byte_from_hex_char(*pattern);
expect[i / 2] |= d;
else
expect[i / 2] = byte_from_hex_char(*pattern) << 4;
expect[i / 2] = d << 4;
}
actual = heap_alloc(size);