summaryrefslogtreecommitdiff
path: root/formula
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-04-30 09:13:53 +0100
committerCaolán McNamara <caolanm@redhat.com>2015-04-30 09:37:31 +0100
commite80f1f1987d7be27f1b4277ddc0a12f348fa53d6 (patch)
tree1b80d24663be7b667996fe9f19e342ced5cf3db0 /formula
parentc9a54162f5c61f8dc0173d742e7e1641670ce7ab (diff)
coverity#1296214 Dereference null return value
Change-Id: Ifc82f42ff8d82cfe094701ace57ff7cadabc59d9
Diffstat (limited to 'formula')
-rw-r--r--formula/source/core/api/FormulaCompiler.cxx7
1 files changed, 5 insertions, 2 deletions
diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx
index dac5283006c8..7319c34b0964 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -1875,10 +1875,13 @@ const FormulaToken* FormulaCompiler::CreateStringFromToken( OUStringBuffer& rBuf
const FormulaToken* const p = pArr->PeekNext();
if (p && p->GetOpCode() == ocTableRefOpen)
{
- t = pArr->Next();
int nLevel = 0;
do
{
+ t = pArr->Next();
+ if (!t)
+ break;
+
// Switch cases correspond with those in
// ScCompiler::HandleTableRef()
switch (t->GetOpCode())
@@ -1903,7 +1906,7 @@ const FormulaToken* FormulaCompiler::CreateStringFromToken( OUStringBuffer& rBuf
nLevel = 0;
bNext = false;
}
- } while (nLevel && (t = pArr->Next()));
+ } while (nLevel);
}
}
break;