summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Weinand <bobwei9@hotmail.com>2014-04-07 17:14:38 +0200
committerBob Weinand <bobwei9@hotmail.com>2014-04-07 17:14:38 +0200
commit0e273217cfd1e72b5109a880fb4334edd2f61448 (patch)
treeb5032e2e3a0c29d1503cca9b065e1b35f9a7fca0
parent7446766dabf6995ec7136e6da8fa5c1573696785 (diff)
downloadphp-git-0e273217cfd1e72b5109a880fb4334edd2f61448.tar.gz
Fix Linux specific fail in error traces
Linux apparently does not like memcpy in overlapping regions...
-rw-r--r--Zend/zend_exceptions.c2
1 files changed, 1 insertions, 1 deletions
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);
/* }}} */