mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-20 08:41:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

Merged revisions 76665 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r76665 | mark.dickinson | 2009-12-04 11:24:38 +0000 (Fri, 04 Dec 2009) | 2 lines

  Avoid undefined behaviour due to overflow in i_divmod (Objects/intobject.c).
........
This commit is contained in:
Mark Dickinson 2009-12-04 11:25:29 +00:00
parent 1b479f24dc
commit 3f8707c23f
1 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Objects/intobject.c
View file

@ -584,7 +584,16 @@ i_divmod(register long x, register long y,
if (y == -1 && UNARY_NEG_WOULD_OVERFLOW(x)) if (y == -1 && UNARY_NEG_WOULD_OVERFLOW(x))
return DIVMOD_OVERFLOW; return DIVMOD_OVERFLOW;
xdivy = x / y; xdivy = x / y;
xmody = x - xdivy * y; /* xdiv*y can overflow on platforms where x/y gives floor(x/y)
* for x and y with differing signs. (This is unusual
* behaviour, and C99 prohibits it, but it's allowed by C89;
* for an example of overflow, take x = LONG_MIN, y = 5 or x =
* LONG_MAX, y = -5.) However, x - xdivy*y is always
* representable as a long, since it lies strictly between
* -abs(y) and abs(y). We add casts to avoid intermediate
* overflow.
*/
xmody = (long)(x - (unsigned long)xdivy * y);
/* If the signs of x and y differ, and the remainder is non-0, /* If the signs of x and y differ, and the remainder is non-0,
* C89 doesn't define whether xdivy is now the floor or the * C89 doesn't define whether xdivy is now the floor or the
* ceiling of the infinitely precise quotient. We want the floor, * ceiling of the infinitely precise quotient. We want the floor,