From 567e2f1cf3f4430b465c03d5005e4b5830bee7d6 Mon Sep 17 00:00:00 2001 From: Ilia Alshanetsky Date: Mon, 3 Oct 2011 18:17:12 +0000 Subject: [PATCH] Fixed bug #55750 (memory copy issue in sysvshm extension). --- NEWS | 4 ++++ ext/sysvshm/sysvshm.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) 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; } -- 2.50.1