[Pkg-php-commits] [php/debian-sid] Cherry pick patch to fix an unaligned mem access in the dba ext

[Raphael Geissert]

---
 debian/patches/series                              |    1 +
 .../upstream/dba_unaligned_mem_access.patch        |   17 +++++++++++++++++
 2 files changed, 18 insertions(+), 0 deletions(-)
 create mode 100644 debian/patches/upstream/dba_unaligned_mem_access.patch

diff --git a/debian/patches/series b/debian/patches/series
index 2313b90..f4c0a93 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -59,3 +59,4 @@ upstream/define_json_error_utf8.patch
 upstream/SplFileInfo_getPathName_parent.patch
 upstream/gc_memory_leak.patch
 upstream/date_mem_leak.patch
+upstream/dba_unaligned_mem_access.patch
diff --git a/debian/patches/upstream/dba_unaligned_mem_access.patch b/debian/patches/upstream/dba_unaligned_mem_access.patch
new file mode 100644
index 0000000..2a352ac
--- /dev/null
+++ b/debian/patches/upstream/dba_unaligned_mem_access.patch
@@ -0,0 +1,17 @@
+Description: Fix an unaligned memory access in the dba extension
+Origin: http://svn.php.net/viewvc?view=revision&revision=295764
+Last-Update: 2010-05-01
+
+Index: php/ext/dba/dba.c
+===================================================================
+--- php.orig/ext/dba/dba.c
++++ php/ext/dba/dba.c
+@@ -250,7 +250,7 @@ static size_t php_dba_make_key(zval *key
+ 	zval *key;													\
+ 	char *key_str, *key_free;									\
+ 	size_t key_len; 											\
+-	int skip = 0;  												\
++	long skip = 0;  											\
+ 	switch(ac) {												\
+ 	case 2: 													\
+ 		if (zend_parse_parameters(ac TSRMLS_CC, "zr", &key, &id) == FAILURE) { \
-- 
1.6.5