[Pkg-php-commits] r1103 - in php5/trunk/debian: . patches
Sean Finney
seanius at alioth.debian.org
Mon Jun 30 19:41:58 UTC 2008
Author: seanius
Date: 2008-06-30 19:41:58 +0000 (Mon, 30 Jun 2008)
New Revision: 1103
Modified:
php5/trunk/debian/changelog
php5/trunk/debian/patches/suhosin.patch
Log:
possible alignment fix for suhosin?
Modified: php5/trunk/debian/changelog
===================================================================
--- php5/trunk/debian/changelog 2008-06-30 19:40:33 UTC (rev 1102)
+++ php5/trunk/debian/changelog 2008-06-30 19:41:58 UTC (rev 1103)
@@ -24,6 +24,9 @@
[ Sean Finney ]
* Fix for CVE-2008-2829: unsafe usage of deprecated imap functions
Patch: CVE-2008-2829.patch
+ * At the suggestion of Stefan Esser, try replacing two specific references
+ of size_t* with char*, due to possible alignment problems on some
+ architectures.
-- Raphael Geissert <atomo64 at gmail.com> Thu, 19 Jun 2008 23:34:39 -0500
Modified: php5/trunk/debian/patches/suhosin.patch
===================================================================
--- php5/trunk/debian/patches/suhosin.patch 2008-06-30 19:40:33 UTC (rev 1102)
+++ php5/trunk/debian/patches/suhosin.patch 2008-06-30 19:41:58 UTC (rev 1103)
@@ -503,10 +503,10 @@
+ } while (0)
+
+# define SUHOSIN_MM_END_CANARY_PTR(block) \
-+ (size_t*)(((char*)(ZEND_MM_DATA_OF(block))) + ((zend_mm_block*)(block))->info.size + END_MAGIC_SIZE)
++ (char*)(((char*)(ZEND_MM_DATA_OF(block))) + ((zend_mm_block*)(block))->info.size + END_MAGIC_SIZE)
+
+# define SUHOSIN_MM_SET_END_CANARY(block) do { \
-+ size_t *p = SUHOSIN_MM_END_CANARY_PTR(block); \
++ char *p = SUHOSIN_MM_END_CANARY_PTR(block); \
+ memcpy(p, &heap->canary_3, CANARY_SIZE); \
+ } while (0)
+
More information about the Pkg-php-commits
mailing list