svn: /php/php-src/ branches/PHP_5_3/ext/sysvshm/sysvshm.c branches/PHP_5_4/NEWS branches/PHP_5_4/ext/sysvshm/sysvshm.c trunk/ext/sysvshm/sysvshm.c
| From: | Ilia Alshanetsky | Date: | Mon, 03 Oct 2011 18:17:12 +0000 |
| Subject: | svn: /php/php-src/ branches/PHP_5_3/ext/sysvshm/sysvshm.c branches/PHP_5_4/NEWS branches/PHP_5_4/ext/sysvshm/sysvshm.c trunk/ext/sysvshm/sysvshm.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-66691@lists.php.net to get a copy of this message | ||
iliaa Mon, 03 Oct 2011 18:17:12 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=317673
Log:
Fixed bug #55750 (memory copy issue in sysvshm extension).
Bug: https://bugs.php.net/55750 (Open) memory copy issue in
sysvshm extension
Changed paths:
U php/php-src/branches/PHP_5_3/ext/sysvshm/sysvshm.c
U php/php-src/branches/PHP_5_4/NEWS
U php/php-src/branches/PHP_5_4/ext/sysvshm/sysvshm.c
U php/php-src/trunk/ext/sysvshm/sysvshm.c
Modified: php/php-src/branches/PHP_5_3/ext/sysvshm/sysvshm.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/sysvshm/sysvshm.c 2011-10-03 17:01:17 UTC (rev 317672)
+++ php/php-src/branches/PHP_5_3/ext/sysvshm/sysvshm.c 2011-10-03 18:17:12 UTC (rev 317673)
@@ -424,7 +424,7 @@
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;
}
Modified: php/php-src/branches/PHP_5_4/NEWS
===================================================================
--- php/php-src/branches/PHP_5_4/NEWS 2011-10-03 17:01:17 UTC (rev 317672)
+++ php/php-src/branches/PHP_5_4/NEWS 2011-10-03 18:17:12 UTC (rev 317673)
@@ -15,6 +15,10 @@
. 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)
Modified: php/php-src/branches/PHP_5_4/ext/sysvshm/sysvshm.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/sysvshm/sysvshm.c 2011-10-03 17:01:17 UTC (rev 317672)
+++ php/php-src/branches/PHP_5_4/ext/sysvshm/sysvshm.c 2011-10-03 18:17:12 UTC (rev 317673)
@@ -424,7 +424,7 @@
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;
}
Modified: php/php-src/trunk/ext/sysvshm/sysvshm.c
===================================================================
--- php/php-src/trunk/ext/sysvshm/sysvshm.c 2011-10-03 17:01:17 UTC (rev 317672)
+++ php/php-src/trunk/ext/sysvshm/sysvshm.c 2011-10-03 18:17:12 UTC (rev 317673)
@@ -424,7 +424,7 @@
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;
}