James Hawkins : msi: Only allow valid styles in msi_dialog_get_style.
Alexandre Julliard
julliard at wine.codeweavers.com
Mon May 7 09:10:27 CDT 2007
Module: wine
Branch: master
Commit: 7f4a4e161f561a8e7416e918c4e57affee688193
URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f4a4e161f561a8e7416e918c4e57affee688193
Author: James Hawkins <truiken at gmail.com>
Date: Sun May 6 20:28:13 2007 -0500
msi: Only allow valid styles in msi_dialog_get_style.
---
dlls/msi/dialog.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c
index 35a192c..5440e67 100644
--- a/dlls/msi/dialog.c
+++ b/dlls/msi/dialog.c
@@ -265,11 +265,11 @@ static LPWSTR msi_dialog_get_style( LPCWSTR p, LPCWSTR *rest )
while ((first = strchrW( p, '{' )) && (q = strchrW( first + 1, '}' )))
{
p = first + 1;
- if( *p == '\\' || *p == '&' )
- p++;
+ if( *p != '\\' && *p != '&' )
+ return NULL;
/* little bit of sanity checking to stop us getting confused with RTF */
- for( i=p; i<q; i++ )
+ for( i=++p; i<q; i++ )
if( *i == '}' || *i == '\\' )
return NULL;
}
More information about the wine-cvs
mailing list