[Python-checkins] cpython (3.4): Issue #19537: Fix PyUnicode_DATA() alignment under m68k. Patch by Andreas
antoine.pitrou
python-checkins at python.org
Sun Mar 23 22:56:00 CET 2014
http://hg.python.org/cpython/rev/004ae1472a43
changeset: 89937:004ae1472a43
branch: 3.4
parent: 89934:bb6377db0a9e
user: Antoine Pitrou <solipsis at pitrou.net>
date: Sun Mar 23 22:55:03 2014 +0100
summary:
Issue #19537: Fix PyUnicode_DATA() alignment under m68k. Patch by Andreas Schwab.
files:
Include/unicodeobject.h | 3 +++
Misc/ACKS | 1 +
Misc/NEWS | 3 +++
3 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/Include/unicodeobject.h b/Include/unicodeobject.h
--- a/Include/unicodeobject.h
+++ b/Include/unicodeobject.h
@@ -343,6 +343,9 @@
the data pointer is filled out. The bit is redundant, and helps
to minimize the test in PyUnicode_IS_READY(). */
unsigned int ready:1;
+ /* Padding to ensure that PyUnicode_DATA() is always aligned to
+ 4 bytes (see issue #19537 on m68k). */
+ unsigned int :24;
} state;
wchar_t *wstr; /* wchar_t representation (null-terminated) */
} PyASCIIObject;
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1170,6 +1170,7 @@
Chad J. Schroeder
Christian Schubert
Sam Schulenburg
+Andreas Schwab
Stefan Schwarzer
Dietmar Schwertberger
Federico Schwindt
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,9 @@
Core and Builtins
-----------------
+- Issue #19537: Fix PyUnicode_DATA() alignment under m68k. Patch by
+ Andreas Schwab.
+
- Issue #20929: Add a type cast to avoid shifting a negative number.
- Issue #20731: Properly position in source code files even if they
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list