1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Catch invalidly-placed exponents on conversion to C locale

Browse Source 
Although the number-parsing code to which the C-locale form is later
passed was already rejecting such malformed texts, it's better to
catch it earlier and to make the check overt in that parsing. Added
some tests cases that would fail if this wasn't checked; but they do
pass already in the parent.

Pick-to: 6.9 6.8 6.5
Change-Id: I5ef9e483317ce4dc519ddc7c4c016dcad5cb22c4
Reviewed-by: Dennis Oberst <dennis.oberst@qt.io>
This commit is contained in:
Edward Welbourne 2025-03-21 19:19:04 +01:00
parent d1879c3a39
commit f1d48552e4
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/text/qlocale.cpp
View File

@ -4659,7 +4659,7 @@ bool QLocaleData::numberToCLocale(QStringView s, QLocale::NumberOptions number_o
return false; return false;
stage = Fraction; stage = Fraction;
} else if (out == 'e') { } else if (out == 'e') {
if (stage == Name) if (wantDigits || stage == Name || stage > Fraction)
return false; return false;
if (stage < Fraction) { if (stage < Fraction) {

3
tests/auto/corelib/text/qlocale/tst_qlocale.cpp
View File

@ -913,6 +913,9 @@ void tst_QLocale::toReal_data()
QTest::newRow("C 1.") << QString("C") << QString("1.") << true << 1.0; QTest::newRow("C 1.") << QString("C") << QString("1.") << true << 1.0;
QTest::newRow("C 1.E10") << QString("C") << QString("1.E10") << true << 1.0e10; QTest::newRow("C 1.E10") << QString("C") << QString("1.E10") << true << 1.0e10;
QTest::newRow("C 1e+10") << QString("C") << QString("1e+10") << true << 1.0e+10; QTest::newRow("C 1e+10") << QString("C") << QString("1e+10") << true << 1.0e+10;
QTest::newRow("C e+10") << QString("C") << QString("e+10") << false << 0.0;
QTest::newRow("C .e+10") << QString("C") << QString(".e+10") << false << 0.0;
QTest::newRow("C 1e+2e+10") << QString("C") << QString("1e+2e+10") << false << 0.0;
QTest::newRow("de_DE 1.") << QString("de_DE") << QString("1.") << false << 0.0; QTest::newRow("de_DE 1.") << QString("de_DE") << QString("1.") << false << 0.0;
QTest::newRow("de_DE 1.2") << QString("de_DE") << QString("1.2") << false << 0.0; QTest::newRow("de_DE 1.2") << QString("de_DE") << QString("1.2") << false << 0.0;