diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2024-03-26 14:16:58 +0100 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2024-03-26 14:53:22 +0100 |
commit | a0f1df9610d692b4d4ee042dcc918f792bde5792 (patch) | |
tree | d68cb43e7d2d46b9805a5ead0f09f77fe2cf7e8a /sources/pyside6/libpyside/pyside.cpp | |
parent | 0e62a3d9903dd22391b769e0df0d37fdb9110d88 (diff) |
Debug operators: Fix handling of longs exceeding long long max
Use PyLong_AsUnsignedLongLong if an overflow occurs. Use hex
for those large values.
Task-number: PYSIDE-2652
Pick-to: 6.7 6.6 6.5 6.2
Change-Id: I9c3404cf8b01b1fcda20516c1105797fc512ed53
Reviewed-by: Christian Tismer <tismer@stackless.com>
Diffstat (limited to 'sources/pyside6/libpyside/pyside.cpp')
-rw-r--r-- | sources/pyside6/libpyside/pyside.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/sources/pyside6/libpyside/pyside.cpp b/sources/pyside6/libpyside/pyside.cpp index 683a3baf9..d5e815a42 100644 --- a/sources/pyside6/libpyside/pyside.cpp +++ b/sources/pyside6/libpyside/pyside.cpp @@ -1072,9 +1072,15 @@ static void formatPyObjectValue(PyObject *obj, QDebug &debug) { if (PyType_Check(obj) != 0) debug << "type: \"" << pyTypeName(obj) << '"'; - else if (PyLong_Check(obj) != 0) - debug << PyLong_AsLongLong(obj); - else if (PyFloat_Check(obj) != 0) + else if (PyLong_Check(obj) != 0) { + const auto llv = PyLong_AsLongLong(obj); + if (PyErr_Occurred() != PyExc_OverflowError) { + debug << llv; + } else { + PyErr_Clear(); + debug << "0x" << Qt::hex << PyLong_AsUnsignedLongLong(obj) << Qt::dec; + } + } else if (PyFloat_Check(obj) != 0) debug << PyFloat_AsDouble(obj); else if (PyUnicode_Check(obj) != 0) debug << '"' << pyStringToQString(obj) << '"'; |