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

Ilia Alshanetsky · Ilia Alshanetsky · commit 567e2f1cf3f4 · 2011-10-03T18:17:12.000Z
diff --git 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
@@ -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;
 }

Original file line number	Diff line number	Diff line change
`@@ -424,7 +424,7 @@ static int php_remove_shm_data(sysvshm_chunk_head *ptr, long shm_varpos)`
`424`	`424`	`ptr->free += chunk_ptr->next;`
`425`	`425`	`ptr->end -= chunk_ptr->next;`
`426`	`426`	`if (memcpy_len > 0) {`
`427`		`- memcpy(chunk_ptr, next_chunk_ptr, memcpy_len);`
	`427`	`+ memmove(chunk_ptr, next_chunk_ptr, memcpy_len);`
`428`	`428`	`}`
`429`	`429`	`return 0;`
`430`	`430`	`}`