Issue #19537: Fix PyUnicode_DATA() alignment under m68k. Patch by Andreas Schwab.

diff --git a/Include/unicodeobject.h b/Include/unicodeobject.h
index c088a0f0c13fd9034ec90eb0383fd3a62496c8f3..faa53d644fda785df02b117b3f2547bb5131d0fb 100644 (file)
--- a/Include/unicodeobject.h
+++ b/Include/unicodeobject.h
@@ -343,6 +343,9 @@ typedef struct {
            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
index 88753892137f67b0799c041886359350347f1064..68617ce1b9407f36e3fd1961a1ff0b9685adcad1 100644 (file)
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1170,6 +1170,7 @@ Robin Schreiber
 Chad J. Schroeder
 Christian Schubert
 Sam Schulenburg
+Andreas Schwab
 Stefan Schwarzer
 Dietmar Schwertberger
 Federico Schwindt

diff --git a/Misc/NEWS b/Misc/NEWS
index b20e458906460fa110ee7bc2aac269eef1a051c7..0ec738833cb36690a4a198be692cdf0d3c72f092 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,9 @@ Release date: TBA
 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