Skip to content

C
cpython
Kaydet (Commit) 982a17e0 authored tarafından Xiang Zhang's avatar Xiang Zhang Kaydeden (comit) GitHub
Dosyalara gözat
Seçenekler

bpo-30242: resolve some undefined behaviours in struct (#1418) (#1588)

üst bd82a070
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 5 deletions
Modules/_struct.c
Dosyayı görüntüle @ 982a17e0
...@@ -506,7 +506,7 @@ np_ubyte(char *p, PyObject *v, const formatdef *f) ...@@ -506,7 +506,7 @@ np_ubyte(char *p, PyObject *v, const formatdef *f)
"ubyte format requires 0 <= number <= 255"); "ubyte format requires 0 <= number <= 255");
return -1; return -1;
} }
*p = (char)x; *(unsigned char *)p = (unsigned char)x;
return 0; return 0;
} }
...@@ -814,6 +814,7 @@ bp_int(char *p, PyObject *v, const formatdef *f) ...@@ -814,6 +814,7 @@ bp_int(char *p, PyObject *v, const formatdef *f)
{ {
long x; long x;
Py_ssize_t i; Py_ssize_t i;
unsigned char *q = (unsigned char *)p;
if (get_long(v, &x) < 0) if (get_long(v, &x) < 0)
return -1; return -1;
i = f->size; i = f->size;
...@@ -826,7 +827,7 @@ bp_int(char *p, PyObject *v, const formatdef *f) ...@@ -826,7 +827,7 @@ bp_int(char *p, PyObject *v, const formatdef *f)
#endif #endif
} }
do { do {
p[--i] = (char)x; q[--i] = (unsigned char)(x & 0xffL);
x >>= 8; x >>= 8;
} while (i > 0); } while (i > 0);
return 0; return 0;
...@@ -837,6 +838,7 @@ bp_uint(char *p, PyObject *v, const formatdef *f) ...@@ -837,6 +838,7 @@ bp_uint(char *p, PyObject *v, const formatdef *f)
{ {
unsigned long x; unsigned long x;
Py_ssize_t i; Py_ssize_t i;
unsigned char *q = (unsigned char *)p;
if (get_ulong(v, &x) < 0) if (get_ulong(v, &x) < 0)
return -1; return -1;
i = f->size; i = f->size;
...@@ -847,7 +849,7 @@ bp_uint(char *p, PyObject *v, const formatdef *f) ...@@ -847,7 +849,7 @@ bp_uint(char *p, PyObject *v, const formatdef *f)
return _range_error(f, 1); return _range_error(f, 1);
} }
do { do {
p[--i] = (char)x; q[--i] = (unsigned char)(x & 0xffUL);
x >>= 8; x >>= 8;
} while (i > 0); } while (i > 0);
return 0; return 0;
...@@ -1034,6 +1036,7 @@ lp_int(char *p, PyObject *v, const formatdef *f) ...@@ -1034,6 +1036,7 @@ lp_int(char *p, PyObject *v, const formatdef *f)
{ {
long x; long x;
Py_ssize_t i; Py_ssize_t i;
unsigned char *q = (unsigned char *)p;
if (get_long(v, &x) < 0) if (get_long(v, &x) < 0)
return -1; return -1;
i = f->size; i = f->size;
...@@ -1046,7 +1049,7 @@ lp_int(char *p, PyObject *v, const formatdef *f) ...@@ -1046,7 +1049,7 @@ lp_int(char *p, PyObject *v, const formatdef *f)
#endif #endif
} }
do { do {
*p++ = (char)x; *q++ = (unsigned char)(x & 0xffL);
x >>= 8; x >>= 8;
} while (--i > 0); } while (--i > 0);
return 0; return 0;
...@@ -1057,6 +1060,7 @@ lp_uint(char *p, PyObject *v, const formatdef *f) ...@@ -1057,6 +1060,7 @@ lp_uint(char *p, PyObject *v, const formatdef *f)
{ {
unsigned long x; unsigned long x;
Py_ssize_t i; Py_ssize_t i;
unsigned char *q = (unsigned char *)p;
if (get_ulong(v, &x) < 0) if (get_ulong(v, &x) < 0)
return -1; return -1;
i = f->size; i = f->size;
...@@ -1067,7 +1071,7 @@ lp_uint(char *p, PyObject *v, const formatdef *f) ...@@ -1067,7 +1071,7 @@ lp_uint(char *p, PyObject *v, const formatdef *f)
return _range_error(f, 1); return _range_error(f, 1);
} }
do { do {
*p++ = (char)x; *q++ = (unsigned char)(x & 0xffUL);
x >>= 8; x >>= 8;
} while (--i > 0); } while (--i > 0);
return 0; return 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment