com php-src: Fix Linux specific fail in error traces Linux apparently does not like memcpy in overlapping regions...: Zend/zend_exceptio ns.c
| From: | Bob Weinand | Date: | Mon, 07 Apr 2014 15:14:38 +0000 |
| Subject: | com php-src: Fix Linux specific fail in error traces Linux apparently does not like memcpy in overlapping regions...: Zend/zend_exceptio ns.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-76715@lists.php.net to get a copy of this message | ||
Commit: 0e273217cfd1e72b5109a880fb4334edd2f61448
Author: Bob Weinand <bobwei9@hotmail.com> Mon, 7 Apr 2014 17:14:38 +0200
Parents: 7446766dabf6995ec7136e6da8fa5c1573696785
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=0e273217cfd1e72b5109a880fb4334edd2f61448
Log:
Fix Linux specific fail in error traces
Linux apparently does not like memcpy in overlapping regions...
Changed paths:
M Zend/zend_exceptions.c
Diff:
diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c
index 9b7d368..e457026 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);
/* }}} */