Skip to content

gh-130317: fix PyFloat_Pack/Unpack[24] for NaN's with payload #130452

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vstinner merged 26 commits into from
Apr 28, 2025
Merged

gh-130317: fix PyFloat_Pack/Unpack[24] for NaN's with payload #130452

Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
971fd98
gh-130317: fix PyFloat_Pack2/Unpack2 for NaN's with payload
skirpichev Feb 22, 2025
b05720a
Merge branch 'master' into fix-nan-packing/130317
skirpichev Feb 25, 2025
f513b14
more tests in test_capi, fix also Pack/Unpack4
skirpichev Feb 25, 2025
218f6b3
+ different fix for Pack/Unpack2 (works as for floats)
skirpichev Feb 25, 2025
a7f5ed9
blacklist on win32
skirpichev Feb 25, 2025
c7c08ff
cleanup and comments
skirpichev Feb 25, 2025
de7b6aa
+ enable test_pack_unpack_roundtrip_nans on win32 for qNaN's
skirpichev Feb 25, 2025
e6c1c12
+1
skirpichev Feb 25, 2025
ac7bdcb
address review: warning on Windows
skirpichev Feb 25, 2025
b461b81
XXX try to revert win32 WA
skirpichev Feb 25, 2025
cbfbf05
Revert "XXX try to revert win32 WA"
skirpichev Feb 26, 2025
6a5dc1a
Merge branch 'master' into fix-nan-packing/130317
skirpichev Feb 26, 2025
86ab7c3
Merge branch 'main' into fix-nan-packing/130317
skirpichev Apr 27, 2025
32bdeed
revert redundant test
skirpichev Apr 27, 2025
773f51e
rename test
skirpichev Apr 27, 2025
b27c916
XXX revert win32 wa
skirpichev Apr 27, 2025
4dc5697
+1
skirpichev Apr 27, 2025
6f71e34
+1
skirpichev Apr 27, 2025
3e5a211
revert
skirpichev Apr 27, 2025
092d729
fixup value on win32
skirpichev Apr 27, 2025
6137c75
cleanup & comments
skirpichev Apr 27, 2025
00dfd66
address review: redo helper
skirpichev Apr 27, 2025
b7f727c
Apply suggestions from code review
skirpichev Apr 28, 2025
13e8310
restore comment
skirpichev Apr 28, 2025
bcf54f6
address review: ensure code works with strict aliasing
skirpichev Apr 28, 2025
9d20633
Apply suggestions from code review
skirpichev Apr 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
+1
  • Loading branch information
@skirpichev
skirpichev committed Apr 27, 2025
commit 4dc5697ea3443c780e5640f0179e807035d635e2
37 changes: 22 additions & 15 deletions Modules/_struct.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,8 @@ static PyObject *
unpack_halffloat(const char *p, /* start of 2-byte string */
int le) /* true for little-endian, false for big-endian */
{
double x = PyFloat_Unpack2(p, le);
volatile double x = PyFloat_Unpack2(p, le);

if (x == -1.0 && PyErr_Occurred()) {
return NULL;
}
Expand All @@ -291,9 +292,8 @@ static PyObject *
unpack_float(const char *p, /* start of 4-byte string */
int le) /* true for little-endian, false for big-endian */
{
double x;
volatile double x = PyFloat_Unpack4(p, le);

x = PyFloat_Unpack4(p, le);
if (x == -1.0 && PyErr_Occurred())
return NULL;
return PyFloat_FromDouble(x);
Expand All @@ -303,9 +303,8 @@ static PyObject *
unpack_double(const char *p, /* start of 8-byte string */
int le) /* true for little-endian, false for big-endian */
{
double x;
volatile double x = PyFloat_Unpack8(p, le);

x = PyFloat_Unpack8(p, le);
if (x == -1.0 && PyErr_Occurred())
return NULL;
return PyFloat_FromDouble(x);
Expand Down Expand Up @@ -989,11 +988,14 @@ bu_double(_structmodulestate *state, const char *p, const formatdef *f)
static PyObject *
bu_float_complex(_structmodulestate *state, const char *p, const formatdef *f)
{
double x = PyFloat_Unpack4(p, 0);
volatile double x = PyFloat_Unpack4(p, 0);

if (x == -1.0 && PyErr_Occurred()) {
return NULL;
}
double y = PyFloat_Unpack4(p + 4, 0);

volatile double y = PyFloat_Unpack4(p + 4, 0);

if (y == -1.0 && PyErr_Occurred()) {
return NULL;
}
Expand All @@ -1003,13 +1005,14 @@ bu_float_complex(_structmodulestate *state, const char *p, const formatdef *f)
static PyObject *
bu_double_complex(_structmodulestate *state, const char *p, const formatdef *f)
{
double x, y;
volatile double x = PyFloat_Unpack8(p, 0);

x = PyFloat_Unpack8(p, 0);
if (x == -1.0 && PyErr_Occurred()) {
return NULL;
}
y = PyFloat_Unpack8(p + 8, 0);

volatile double y = PyFloat_Unpack8(p + 8, 0);

if (y == -1.0 && PyErr_Occurred()) {
return NULL;
}
Expand Down Expand Up @@ -1328,11 +1331,14 @@ lu_double(_structmodulestate *state, const char *p, const formatdef *f)
static PyObject *
lu_float_complex(_structmodulestate *state, const char *p, const formatdef *f)
{
double x = PyFloat_Unpack4(p, 1);
volatile double x = PyFloat_Unpack4(p, 1);

if (x == -1.0 && PyErr_Occurred()) {
return NULL;
}
double y = PyFloat_Unpack4(p + 4, 1);

volatile double y = PyFloat_Unpack4(p + 4, 1);

if (y == -1.0 && PyErr_Occurred()) {
return NULL;
}
Expand All @@ -1342,13 +1348,14 @@ lu_float_complex(_structmodulestate *state, const char *p, const formatdef *f)
static PyObject *
lu_double_complex(_structmodulestate *state, const char *p, const formatdef *f)
{
double x, y;
volatile double x = PyFloat_Unpack8(p, 1);

x = PyFloat_Unpack8(p, 1);
if (x == -1.0 && PyErr_Occurred()) {
return NULL;
}
y = PyFloat_Unpack8(p + 8, 1);

volatile double y = PyFloat_Unpack8(p + 8, 1);

if (y == -1.0 && PyErr_Occurred()) {
return NULL;
}
Expand Down