commit 0f3445d6db7743a6707705f72dd7ff03bb860fea
author Alexandre Julliard <julliard@winehq.org> Mon Feb 09 14:20:00 2009 +0100
committer Alexandre Julliard <julliard@winehq.org> Mon Feb 09 14:37:22 2009 +0100
tree 775a174f74bc592558b3f74d06af6bf927eec7cb
parent 398b5cfef6ac03df0e573b57b9c9ec70e8cbc5be

dbghelp: Fix handling of empty file regexp (Coverity).

dlls/dbghelp/symbol.c

diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c
index 9e66f00..0810506 100644
--- a/dlls/dbghelp/symbol.c
+++ b/dlls/dbghelp/symbol.c
@@ -128,10 +128,11 @@
     char *mask, *p;
     BOOL ret;
 
+    if (!srcfile || !*srcfile) return regcomp(re, ".*", REG_NOSUB);
+
     p = mask = HeapAlloc(GetProcessHeap(), 0, 5 * strlen(srcfile) + 4);
     *p++ = '^';
-    if (!srcfile || !*srcfile) *p++ = '*';
-    else while (*srcfile)
+    while (*srcfile)
     {
         switch (*srcfile)
         {
@@ -192,12 +193,14 @@
 
 static BOOL compile_file_regex(regex_t* re, const char* srcfile)
 {
-    compile_regex( srcfile, -1, re, FALSE );
+    if (!srcfile || !*srcfile) re->str = NULL;
+    else compile_regex( srcfile, -1, re, FALSE );
     return TRUE;
 }
 
 static int match_regexp( const regex_t *re, const char *str )
 {
+    if (!re->str) return 1;
     if (re->icase) return !lstrcmpiA( re->str, str );
     return !strcmp( re->str, str );
 }