cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix wrong conversion of negative 64-bit wxAny to wxVariant

Browse Source 
Extracting the lower part of a 64-bit value only works when long is
32-bit, but not if it's 64-bit as well as is the case under LP64 Unix
systems.

Just use a normal cast to long instead, as this is simpler and works in
all cases.

Also add a simple unit test for this case, which would have previously
failed, but passes now.

Closes #22592.

Closes #22595.
This commit is contained in:
Vadim Zeitlin 2022-07-02 21:57:29 +02:00
parent ba05185070
commit 8a17c52c3b
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/any.cpp
View File

@ -165,7 +165,7 @@ bool wxConvertAnyToVariant(const wxAny& any, wxVariant* variant)
if ( ll > wxINT32_MAX || ll < wxINT32_MIN ) if ( ll > wxINT32_MAX || ll < wxINT32_MIN )
*variant = wxLongLong(ll); *variant = wxLongLong(ll);
else else
*variant = (long) wxLongLong(ll).GetLo(); *variant = static_cast<long>(ll);
} }
else else
{ {

6
tests/any/anytest.cpp
View File

@ -617,6 +617,12 @@ void wxAnyTestCase::wxVariantConversions()
CPPUNIT_ASSERT(res); CPPUNIT_ASSERT(res);
CPPUNIT_ASSERT(variant.GetType() == "ulonglong"); CPPUNIT_ASSERT(variant.GetType() == "ulonglong");
CPPUNIT_ASSERT(variant.GetULongLong() == wxULongLong(wxULL(123456))); CPPUNIT_ASSERT(variant.GetULongLong() == wxULongLong(wxULL(123456)));
any = (wxLongLong_t)-1;
res = any.GetAs(&variant);
CPPUNIT_ASSERT(res);
CPPUNIT_ASSERT(variant.GetType() == "long");
CPPUNIT_ASSERT(variant.GetLong() == -1);
#endif #endif
// Cannot test equality for the rest, just test that they convert // Cannot test equality for the rest, just test that they convert