[Pkg-php-commits] [php/debian-sid] Cherry pick fix for unaligned memory access in ext/hash/hash_tiger.c

[Ondřej Surý]

---
 debian/patches/series                              |    1 +
 .../unaligned_memory_access_in_hash_tiger.c.patch  |   13 +++++++++++++
 2 files changed, 14 insertions(+), 0 deletions(-)
 create mode 100644 debian/patches/unaligned_memory_access_in_hash_tiger.c.patch

diff --git a/debian/patches/series b/debian/patches/series
index 24778e8..e8967ad 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -73,3 +73,4 @@ reject-filenames-with-null-r305507.patch
 fix-open_basedir-with-separator-r305698.patch
 CVE-2010-4409.patch
 crash_in_zip_extract.patch
+unaligned_memory_access_in_hash_tiger.c.patch
diff --git a/debian/patches/unaligned_memory_access_in_hash_tiger.c.patch b/debian/patches/unaligned_memory_access_in_hash_tiger.c.patch
new file mode 100644
index 0000000..4fcf9d2
--- /dev/null
+++ b/debian/patches/unaligned_memory_access_in_hash_tiger.c.patch
@@ -0,0 +1,13 @@
+--- a/ext/hash/php_hash_tiger.h
++++ b/ext/hash/php_hash_tiger.h
+@@ -25,9 +25,9 @@
+ typedef struct {
+ 	php_hash_uint64 state[3];
+ 	php_hash_uint64 passed;
++	unsigned char buffer[64];
+ 	unsigned int passes:1;
+ 	unsigned int length:7;
+-	unsigned char buffer[64];
+ } PHP_TIGER_CTX;
+ 
+ PHP_HASH_API void PHP_3TIGERInit(PHP_TIGER_CTX *context);
-- 
1.7.1