Commit 1004a533 authored by Neal Norwitz's avatar Neal Norwitz

Patch #1488312, Fix memory alignment problem on SPARC in unicode. Will backport

parent 373f0a71
......@@ -455,6 +455,7 @@ Denis S. Otkidach
Russel Owen
Mike Pall
Todd R. Palmer
Jan Palus
Alexandre Parenteau
Dan Parisien
Harri Pasanen
......
......@@ -12,6 +12,8 @@ What's New in Python 2.5 alpha 3?
Core and builtins
-----------------
- Patch #1488312, Fix memory alignment problem on SPARC in unicode
- Bug #1487966: Fix SystemError with conditional expression in assignment
- WindowsError now has two error code attributes: errno, which carries
......
......@@ -2313,7 +2313,7 @@ PyObject *_PyUnicode_DecodeUnicodeInternal(const char *s,
end = s + size;
while (s < end) {
*p = *(Py_UNICODE *)s;
memcpy(p, s, sizeof(Py_UNICODE));
/* We have to sanity check the raw data, otherwise doom looms for
some malformed UCS-4 data. */
if (
......
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