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

This commit is contained in:
Ilia Alshanetsky 2011-10-03 18:17:12 +00:00
parent 2e925f6f19
commit 567e2f1cf3
2 changed files with 5 additions and 1 deletions

4
NEWS
View File

@ -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)

View File

@ -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;
}