[Libreoffice-commits] core.git: connectivity/source

[Stephan Bergmann]

 connectivity/source/drivers/file/FResultSet.cxx |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit d203855908dfb139f9ba2f755d5056de7c34d842
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Dec 13 15:37:24 2013 +0100

    assert non-nullness
    
    dd0990db74a4a5c3a129a7ff0ed2a739cd74a381 "fdo#72463 RowSet: on execute when not
    dirty, rebuild cache" had temporarily introduced a bug that caused m_pParseTree
    to be null here during JunitTest_dbaccess_unoapi, but Lionel states that it
    cannot legitimately be null, even though the computation of m_bIsCount in the
    ctor takes potentially null m_pParseTree into account.
    
    Change-Id: If95f076a4c80f80cd58bba83521633fe8bb71f5d

diff --git a/connectivity/source/drivers/file/FResultSet.cxx b/connectivity/source/drivers/file/FResultSet.cxx
index d8fbde1..11da82b 100644
--- a/connectivity/source/drivers/file/FResultSet.cxx
+++ b/connectivity/source/drivers/file/FResultSet.cxx
@@ -1428,6 +1428,7 @@ sal_Bool OResultSet::OpenImpl()
             else
             {
                 sal_Bool bDistinct = sal_False;
+                assert(m_pParseTree != 0);
                 OSQLParseNode *pDistinct = m_pParseTree->getChild(1);
 
                 assert(m_aOrderbyColumnNumber.size() ==