From 1022f9cc35564b216a4bcd7c65e8243c810a0ca9 Mon Sep 17 00:00:00 2001
From: Tom McDermott
Date: Mon, 5 Aug 2019 15:15:28 +1000
Subject: py/modstruct: Fix struct.unpack with unaligned offset of native type.

With this patch alignment is done relative to the start of the buffer that
is being unpacked, not the raw pointer value, as per CPython.

Fixes issue #3314.
---
 tests/basics/struct_endian.py | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 tests/basics/struct_endian.py

(limited to 'tests')

diff --git a/tests/basics/struct_endian.py b/tests/basics/struct_endian.py
new file mode 100644
index 000000000..ae3243824
--- /dev/null
+++ b/tests/basics/struct_endian.py
@@ -0,0 +1,17 @@
+# test ustruct and endian specific things
+
+try:
+    import ustruct as struct
+except:
+    try:
+        import struct
+    except ImportError:
+        print("SKIP")
+        raise SystemExit
+
+# unpack/unpack_from with unaligned native type
+buf = b'0123456789'
+print(struct.unpack('h', memoryview(buf)[1:3]))
+print(struct.unpack_from('i', buf, 1))
+print(struct.unpack_from('@i', buf, 1))
+print(struct.unpack_from('@ii', buf, 1))
-- 
cgit v1.2.3