diff --git a/connectivity/source/parse/sqliterator.cxx b/connectivity/source/parse/sqliterator.cxx index 06b07cac2922..ae9fff2b2202 100644 --- a/connectivity/source/parse/sqliterator.cxx +++ b/connectivity/source/parse/sqliterator.cxx @@ -1249,9 +1249,10 @@ bool OSQLParseTreeIterator::traverseSelectionCriteria(const OSQLParseNode* pSele return false; } - if (! SQL_ISRULE(pWhereClause,where_clause)) { + if (!pWhereClause || !SQL_ISRULE(pWhereClause,where_clause)) + { // The WHERE clause is optional most of the time; which means it could be a "optional_where_clause". - OSL_ENSURE(SQL_ISRULE(pWhereClause,opt_where_clause),"OSQLParseTreeIterator: error in parse tree!"); + OSL_ENSURE(pWhereClause && SQL_ISRULE(pWhereClause,opt_where_clause),"OSQLParseTreeIterator: error in parse tree!"); return false; }