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

msi: Avoid using isspace()/isdigit() for WCHARs. 

Found with Coccinelle.

Signed-off-by: Akihiro Sagawa <sagawa.aki@gmail.com>
Signed-off-by: Hans Leidekker <hans@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
oldstable
Akihiro Sagawa 2017-05-18 10:16:14 +02:00 committed by Alexandre Julliard
parent bb6a65e0ca
commit f6ced24999
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
dlls/msi/tokenize.c
View File

@ -187,6 +187,21 @@ static const char isIdChar[] = {
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* Fx */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* Fx */
}; };
/*
** WCHAR safe version of isdigit()
*/
static inline int isDigit(WCHAR c)
{
return c >= '0' && c <= '9';
}
/*
** WCHAR safe version of isspace(), except '\r'
*/
static inline int isSpace(WCHAR c)
{
return c == ' ' || c == '\t' || c == '\n' || c == '\f';
}
/* /*
** Return the length of the token that begins at z[0]. Return ** Return the length of the token that begins at z[0]. Return
@ -199,7 +214,7 @@ int sqliteGetToken(const WCHAR *z, int *tokenType, int *skip){
*skip = 0; *skip = 0;
switch( *z ){ switch( *z ){
case ' ': case '\t': case '\n': case '\f': case ' ': case '\t': case '\n': case '\f':
for(i=1; isspace(z[i]) && z[i] != '\r'; i++){} for(i=1; isSpace(z[i]); i++){}
*tokenType = TK_SPACE; *tokenType = TK_SPACE;
return i; return i;
case '-': case '-':
@ -265,7 +280,7 @@ int sqliteGetToken(const WCHAR *z, int *tokenType, int *skip){
return i; return i;
} }
case '.': case '.':
if( !isdigit(z[1]) ){ if( !isDigit(z[1]) ){
*tokenType = TK_DOT; *tokenType = TK_DOT;
return 1; return 1;
} }
@ -273,7 +288,7 @@ int sqliteGetToken(const WCHAR *z, int *tokenType, int *skip){
case '0': case '1': case '2': case '3': case '4': case '0': case '1': case '2': case '3': case '4':
case '5': case '6': case '7': case '8': case '9': case '5': case '6': case '7': case '8': case '9':
*tokenType = TK_INTEGER; *tokenType = TK_INTEGER;
for(i=1; isdigit(z[i]); i++){} for(i=1; isDigit(z[i]); i++){}
return i; return i;
case '[': case '[':
for(i=1; z[i] && z[i-1]!=']'; i++){} for(i=1; z[i] && z[i-1]!=']'; i++){}