[php-maint] Bug#714041: php5-cli: Error in `php5': double free or corruption (!prev): 0x0a487ad0

[Andreas Schwab]

Index: php-5.5.11/Zend/Zend.m4
===================================================================
--- php-5.5.11.orig/Zend/Zend.m4
+++ php-5.5.11/Zend/Zend.m4
@@ -263,7 +263,7 @@ typedef union _mm_align_test {
 
 int main()
 {
-  int i = ZEND_MM_ALIGNMENT;
+  int i = ZEND_MM_ALIGNMENT < 4 ? 4 : ZEND_MM_ALIGNMENT;
   int zeros = 0;
   FILE *fp;
 
@@ -273,7 +273,7 @@ int main()
   }
 
   fp = fopen("conftest.zend", "w");
-  fprintf(fp, "%d %d\n", ZEND_MM_ALIGNMENT, zeros);  
+  fprintf(fp, "%d %d\n", ZEND_MM_ALIGNMENT < 4 ? 4 : ZEND_MM_ALIGNMENT, zeros);  
   fclose(fp);
 
   exit(0);
Index: php-5.5.11/configure
===================================================================
--- php-5.5.11.orig/configure
+++ php-5.5.11/configure
@@ -103498,7 +103498,7 @@ typedef union _mm_align_test {
 
 int main()
 {
-  int i = ZEND_MM_ALIGNMENT;
+  int i = ZEND_MM_ALIGNMENT < 4 ? 4 : ZEND_MM_ALIGNMENT;
   int zeros = 0;
   FILE *fp;
 
@@ -103508,7 +103508,7 @@ int main()
   }
 
   fp = fopen("conftest.zend", "w");
-  fprintf(fp, "%d %d\n", ZEND_MM_ALIGNMENT, zeros);
+  fprintf(fp, "%d %d\n", ZEND_MM_ALIGNMENT < 4 ? 4 : ZEND_MM_ALIGNMENT, zeros);
   fclose(fp);
 
   exit(0);

Andreas.

-- 
Andreas Schwab, schwab at linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."