Merge branch 'PHP-5.4' into PHP-5.5

12 years ago · 5bc4eb714a
2 changed files with 4 additions and 1 deletions
--- a/3
+++ b/3
@ -12,6 +12,9 @@ PHP                                                                        NEWS
  . Fixed bug #65701 (copy() doesn't work when destination filename is created
    by tempnam()). (Boro Sitnikovski)
  . Fixed bug #67072 (Echoing unserialized "SplFileObject" crash). (Anatol)
+  . Fixed bug #67245 (usage of memcpy() with overlapping src and dst in
+    zend_exceptions.c) (backported fix from PHP 5.6; initially committed
+    to wrong branch). (Bob)

 - Curl:
  . Fixed bug #64247 (CURLOPT_INFILE doesn't allow reset). (Mike)
--- a/Zend/zend_exceptions.c
+++ b/Zend/zend_exceptions.c
@ -363,7 +363,7 @@ ZEND_METHOD(error_exception, getSeverity)

 #define TRACE_ARG_APPEND(vallen)								\
 	*str = (char*)erealloc(*str, *len + 1 + vallen);					\
-	memcpy((*str) + *len - l_added + 1 + vallen, (*str) + *len - l_added + 1, l_added);
+	memmove((*str) + *len - l_added + 1 + vallen, (*str) + *len - l_added + 1, l_added);

 /* }}} */