Fixed bug #50987 (unaligned memory access in phar.c)

jbondc · Nov 20, 2010 · 5f1b91a · 5f1b91a
1 parent 4415b3a
commit 5f1b91a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/NEWS b/NEWS
@@ -8,6 +8,8 @@
 - Fixed crashes on invalid parameters in intl extension (Stas, Maksymilian
   Arciemowicz)
 - Fixed bug #53362 (Segmentation fault when extending SplFixedArray). (Felipe)
+- Fixed bug #50987 (unaligned memory access in phar.c).
+  (geissert at debian dot org, Ilia)
 - Fixed bug #47168 (printf of floating point variable prints maximum of 40 
   decimal places). (Ilia)
 

diff --git a/ext/phar/phar.c b/ext/phar/phar.c
@@ -2491,7 +2491,7 @@ static inline void phar_set_32(char *buffer, int var) /* {{{ */
 	*((buffer) + 1) = (unsigned char) (((var) >> 8) & 0xFF);
 	*((buffer) + 0) = (unsigned char) ((var) & 0xFF);
 #else
-	*(php_uint32 *)(buffer) = (php_uint32)(var);
+	 memcpy(buffer, &var, sizeof(var));
 #endif
 } /* }}} */