diff options
| author | Neal Norwitz <nnorwitz@gmail.com> | 2006-05-15 07:17:23 (GMT) |
|---|---|---|
| committer | Neal Norwitz <nnorwitz@gmail.com> | 2006-05-15 07:17:23 (GMT) |
| commit | 1004a5339a78fa77face21cf23ab551bf866ffce (patch) | |
| tree | 85f2d04eadab46008f24374ef96a65a0761b6b4a | |
| parent | 373f0a718c359bc9e554ec323a9d71844ee76dfc (diff) | |
| download | cpython-1004a5339a78fa77face21cf23ab551bf866ffce.zip cpython-1004a5339a78fa77face21cf23ab551bf866ffce.tar.gz cpython-1004a5339a78fa77face21cf23ab551bf866ffce.tar.bz2 | |
Patch #1488312, Fix memory alignment problem on SPARC in unicode. Will backport
| -rw-r--r-- | Misc/ACKS | 1 | ||||
| -rw-r--r-- | Misc/NEWS | 2 | ||||
| -rw-r--r-- | Objects/unicodeobject.c | 2 |
3 files changed, 4 insertions, 1 deletions
@@ -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 diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c index 292d02b..a3af7f6 100644 --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -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 ( |