From: Ilia Alshanetsky <iliaa@php.net>
Date: Mon, 3 Oct 2011 18:17:12 +0000 (+0000)
Subject: Fixed bug #55750 (memory copy issue in sysvshm extension).
X-Git-Tag: php-5.4.0beta2~47
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=567e2f1cf3f4430b465c03d5005e4b5830bee7d6;p=php

Fixed bug #55750 (memory copy issue in sysvshm extension).
---

diff --git a/NEWS b/NEWS
index 456e2335b0..4caac73577 100644
--- a/NEWS
+++ b/NEWS
@@ -15,6 +15,10 @@ PHP                                                                        NEWS
   . Fixed bug #55825 (Missing initial value of static locals in trait methods).
     (Laruence)
 
+- Sysvshm
+  . Fixed bug #55750 (memory copy issue in sysvshm extension).
+    (Ilia, jeffhuang9999 at gmail dot com)
+
 - Zlib:
   . Fixed bug #55544 (ob_gzhandler always conflicts with 
     zlib.output_compression). (Mike)
diff --git a/ext/sysvshm/sysvshm.c b/ext/sysvshm/sysvshm.c
index 33b1070325..781c856ec9 100644
--- a/ext/sysvshm/sysvshm.c
+++ b/ext/sysvshm/sysvshm.c
@@ -424,7 +424,7 @@ static int php_remove_shm_data(sysvshm_chunk_head *ptr, long shm_varpos)
 	ptr->free += chunk_ptr->next;
 	ptr->end -= chunk_ptr->next;
 	if (memcpy_len > 0) {
-		memcpy(chunk_ptr, next_chunk_ptr, memcpy_len);
+		memmove(chunk_ptr, next_chunk_ptr, memcpy_len);
 	}
 	return 0;
 }