msi: Only allow valid styles in msi_dialog_get_style.

7f4a4e16 · James Hawkins · Alexandre Julliard · 4ccee1ae · 7f4a4e16
Commit 7f4a4e16 authored May 06, 2007 by James Hawkins Committed by Alexandre Julliard May 07, 2007
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

dialog.c dlls/msi/dialog.c +3 -3

No files found.
--- 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;
    }