diff options
| author | Bob Weinand <bobwei9@hotmail.com> | 2014-05-11 15:15:27 +0200 |
|---|---|---|
| committer | Bob Weinand <bobwei9@hotmail.com> | 2014-05-11 15:15:27 +0200 |
| commit | 5bc4eb714aee31268538fcd170e2425ff699ff53 (patch) | |
| tree | 4e56fa2b64891b416bc64631df6ba0463f0d7922 | |
| parent | b99862e7ae4336c5bdb20514f845e63c6c1b43f6 (diff) | |
| parent | 62b2eb666d8d418e1c4672bc81d00111f18049bd (diff) | |
| download | php-git-5bc4eb714aee31268538fcd170e2425ff699ff53.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | Zend/zend_exceptions.c | 2 |
2 files changed, 4 insertions, 1 deletions
@@ -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 9b7d3689c6..e4570269e3 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); /* }}} */ |