diff --git a/NEWS b/NEWS index e2803d6dfc5..c5757ccef95 100644 --- a/NEWS +++ b/NEWS @@ -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) diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c index 9b7d3689c69..e4570269e3a 100644 --- 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); /* }}} */