+1

Author: skirpichev

Modules/_struct.c

@@ -279,7 +279,8 @@ pack_halffloat(_structmodulestate *state,
                PyObject *v,  /* value to pack */
                int le)       /* true for little-endian, false for big-endian */
 {
-    double x = PyFloat_AsDouble(v);
+    volatile double x = PyFloat_AsDouble(v);
+
     if (x == -1.0 && PyErr_Occurred()) {
         PyErr_SetString(state->StructError,
                         "required argument is not a float");
@@ -764,26 +765,28 @@ np_halffloat(_structmodulestate *state, char *p, PyObject *v, const formatdef *f
 static int
 np_float(_structmodulestate *state, char *p, PyObject *v, const formatdef *f)
 {
-    float x = (float)PyFloat_AsDouble(v);
+    volatile float x = (float)PyFloat_AsDouble(v);
+
     if (x == -1 && PyErr_Occurred()) {
         PyErr_SetString(state->StructError,
                         "required argument is not a float");
         return -1;
     }
-    memcpy(p, &x, sizeof x);
+    memcpy(p, (void *)&x, sizeof x);
     return 0;
 }
 
 static int
 np_double(_structmodulestate *state, char *p, PyObject *v, const formatdef *f)
 {
-    double x = PyFloat_AsDouble(v);
+    volatile double x = PyFloat_AsDouble(v);
+
     if (x == -1 && PyErr_Occurred()) {
         PyErr_SetString(state->StructError,
                         "required argument is not a float");
         return -1;
     }
-    memcpy(p, &x, sizeof(double));
+    memcpy(p, (void *)&x, sizeof(double));
     return 0;
 }
 
@@ -1138,7 +1141,8 @@ bp_halffloat(_structmodulestate *state, char *p, PyObject *v, const formatdef *f
 static int
 bp_float(_structmodulestate *state, char *p, PyObject *v, const formatdef *f)
 {
-    double x = PyFloat_AsDouble(v);
+    volatile double x = PyFloat_AsDouble(v);
+
     if (x == -1 && PyErr_Occurred()) {
         PyErr_SetString(state->StructError,
                         "required argument is not a float");
@@ -1150,7 +1154,8 @@ bp_float(_structmodulestate *state, char *p, PyObject *v, const formatdef *f)
 static int
 bp_double(_structmodulestate *state, char *p, PyObject *v, const formatdef *f)
 {
-    double x = PyFloat_AsDouble(v);
+    volatile double x = PyFloat_AsDouble(v);
+
     if (x == -1 && PyErr_Occurred()) {
         PyErr_SetString(state->StructError,
                         "required argument is not a float");
@@ -1475,7 +1480,8 @@ lp_halffloat(_structmodulestate *state, char *p, PyObject *v, const formatdef *f
 static int
 lp_float(_structmodulestate *state, char *p, PyObject *v, const formatdef *f)
 {
-    double x = PyFloat_AsDouble(v);
+    volatile double x = PyFloat_AsDouble(v);
+
     if (x == -1 && PyErr_Occurred()) {
         PyErr_SetString(state->StructError,
                         "required argument is not a float");
@@ -1487,7 +1493,8 @@ lp_float(_structmodulestate *state, char *p, PyObject *v, const formatdef *f)
 static int
 lp_double(_structmodulestate *state, char *p, PyObject *v, const formatdef *f)
 {
-    double x = PyFloat_AsDouble(v);
+    volatile double x = PyFloat_AsDouble(v);
+
     if (x == -1 && PyErr_Occurred()) {
         PyErr_SetString(state->StructError,
                         "required argument is not a float");