From 7da04aab6d0166005beb776f2135707fc57d716e Mon Sep 17 00:00:00 2001 From: Hans Leidekker Date: Wed, 28 Aug 2013 09:49:05 +0200 Subject: [PATCH] wbemprox: Avoid a crash on file or directory queries with an empty WHERE clause. --- dlls/wbemprox/builtin.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 9e2369ae90d..d310704a0e1 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -1085,9 +1085,12 @@ static BOOL seen_dir( struct dirstack *dirstack, const WCHAR *path ) /* optimize queries of the form WHERE Name='...' [OR Name='...']* */ static UINT seed_dirs( struct dirstack *dirstack, const struct expr *cond, WCHAR root, UINT *count ) { - const struct expr *left = cond->u.expr.left, *right = cond->u.expr.right; + const struct expr *left, *right; - if (cond->type != EXPR_COMPLEX) return *count = 0; + if (!cond || cond->type != EXPR_COMPLEX) return *count = 0; + + left = cond->u.expr.left; + right = cond->u.expr.right; if (cond->u.expr.op == OP_EQ) { UINT len; -- 2.11.4.GIT