[Python-checkins] r46002 - in python/branches/release24-maint: Misc/ACKS Misc/NEWS Objects/unicodeobject.c

[neal.norwitz]

Author: neal.norwitz
Date: Mon May 15 09:22:23 2006
New Revision: 46002

Modified:
   python/branches/release24-maint/Misc/ACKS
   python/branches/release24-maint/Misc/NEWS
   python/branches/release24-maint/Objects/unicodeobject.c
Log:
Backport: Patch #1488312, Fix memory alignment problem on SPARC in unicode.

Modified: python/branches/release24-maint/Misc/ACKS
==============================================================================
--- python/branches/release24-maint/Misc/ACKS	(original)
+++ python/branches/release24-maint/Misc/ACKS	Mon May 15 09:22:23 2006
@@ -440,6 +440,7 @@
 Russel Owen
 Mike Pall
 Todd R. Palmer
+Jan Palus
 Alexandre Parenteau
 Dan Parisien
 Harri Pasanen

Modified: python/branches/release24-maint/Misc/NEWS
==============================================================================
--- python/branches/release24-maint/Misc/NEWS	(original)
+++ python/branches/release24-maint/Misc/NEWS	Mon May 15 09:22:23 2006
@@ -12,6 +12,8 @@
 Core and builtins
 -----------------
 
+- Patch #1488312, Fix memory alignment problem on SPARC in unicode
+
 Extension Modules
 -----------------
 

Modified: python/branches/release24-maint/Objects/unicodeobject.c
==============================================================================
--- python/branches/release24-maint/Objects/unicodeobject.c	(original)
+++ python/branches/release24-maint/Objects/unicodeobject.c	Mon May 15 09:22:23 2006
@@ -2302,7 +2302,7 @@
     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 (