palo/valentina
1
0
Fork 0
mirror of https://gitlab.com/smart-pattern/valentina.git synced 2024-10-03 05:41:36 +02:00
Code Issues Projects Releases Wiki Activity

Fixed issue #964. Assign operator crashes math parser.

Browse source 
--HG--
branch : release
This commit is contained in:
Roman Telezhynskyi 2019-04-13 18:18:48 +03:00
parent 8a58ccdb3a
commit a8ec25caf7
3 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ChangeLog.txt
View file

@ -20,6 +20,7 @@
- [#957] Unable to cut an arc with negative length.
- [#962] Failed to load LibEGL.
- [#963] Bug in tool Point intersect curve and axis.
- [#964] Assign operator crashes math parser.
# Version 0.6.1 October 23, 2018
- [#885] Regression. Broken support for multi size measurements.

8
src/libs/qmuparser/qmuparserbase.cpp
View file

@ -915,7 +915,11 @@ void QmuParserBase::ApplyBinOprt(QStack<token_type> &a_stOpt, QStack<token_type>
}
else
{
Q_ASSERT(a_stVal.size()>=2);
if(a_stVal.size()<2)
{
Error(ecUNEXPECTED_OPERATOR);
}
token_type valTok1 = a_stVal.pop(),
valTok2 = a_stVal.pop(),
optTok = a_stOpt.pop(),
@ -930,7 +934,7 @@ void QmuParserBase::ApplyBinOprt(QStack<token_type> &a_stOpt, QStack<token_type>
{
if (valTok2.GetCode()!=cmVAR)
{
Error(ecUNEXPECTED_OPERATOR, -1, "=");
Error(ecUNEXPECTED_OPERATOR, -1, QChar('='));
}
m_vRPN.AddAssignOp(valTok2.GetVar());
}

1
src/libs/qmuparser/qmuparsertest.cpp
View file

@ -266,6 +266,7 @@ int QmuParserTester::TestBinOprt()
iStat += EqnTest ( "2*(a=b+1)", 6, true );
iStat += EqnTest ( "(a=b+1)*2", 6, true );
iStat += EqnTest ( "a=c; a*10", 30, true);
iStat += EqnTest ( "a = -", 0, false ); // broken assigment
iStat += EqnTest ( "2^2^3", 256, true );
iStat += EqnTest ( "1/2/3", 1.0 / 6.0, true );