com php-src: backport missing rev bfdc9e280515c1639dfe1d81ce6fc225d2cf1bc9: ext/sockets/conversions.c
| From: | Anatol Belski | Date: | Thu, 25 Jun 2015 09:34:04 +0000 |
| Subject: | com php-src: backport missing rev bfdc9e280515c1639dfe1d81ce6fc225d2cf1bc9: ext/sockets/conversions.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-87526@lists.php.net to get a copy of this message | ||
Commit: 7bb52dda6a47565a2788575455726bd3214659d6
Author: Anatol Belski <ab@php.net> Thu, 25 Jun 2015 11:34:04 +0200
Parents: 1efe5b115788080b5d086fafd342322cee874eb5
Branches: PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=7bb52dda6a47565a2788575455726bd3214659d6
Log:
backport missing rev bfdc9e280515c1639dfe1d81ce6fc225d2cf1bc9
Changed paths:
M ext/sockets/conversions.c
Diff:
diff --git a/ext/sockets/conversions.c b/ext/sockets/conversions.c
index 30e895d..eeec99f 100644
--- a/ext/sockets/conversions..c
+++ b/ext/sockets/conversions.c
@@ -910,7 +910,7 @@ static void from_zval_write_control(const zval *arr,
if (space_left < req_space) {
*control_buf = safe_erealloc(*control_buf, 2, req_space, *control_len);
*control_len += 2 * req_space;
- memset(*control_buf + *offset, '\0', *control_len - *offset);
+ memset((char *)*control_buf + *offset, '\0', *control_len - *offset);
memcpy(&alloc->data, control_buf, sizeof *control_buf);
}