diff options
| author | Bob Weinand <bobwei9@hotmail.com> | 2014-05-11 15:11:03 +0200 |
|---|---|---|
| committer | Bob Weinand <bobwei9@hotmail.com> | 2014-05-11 15:11:03 +0200 |
| commit | 5bf6a093ad9072865c6b1b52e39144b16dfe5300 (patch) | |
| tree | da7142155a7ee0326cd032674bae7bcf9bf5d30a | |
| parent | fb3b8de98deb03f4d9d6ee8745df4fa221bbd78e (diff) | |
| download | php-git-5bf6a093ad9072865c6b1b52e39144b16dfe5300.tar.gz | |
Fix Linux specific fail in error traces (cherry-picked and fix for bug #67245)
Linux apparently does not like memcpy in overlapping regions...
| -rw-r--r-- | Zend/zend_exceptions.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c index ced1ebf639..bf90ae7be3 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); /* }}} */ |