summaryrefslogtreecommitdiff
path: root/ext/sockets
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2015-06-25 11:34:04 +0200
committerAnatol Belski <ab@php.net>2015-06-25 11:34:04 +0200
commit7bb52dda6a47565a2788575455726bd3214659d6 (patch)
tree17846b0f664414211c51bd0db5a32daf77e40ff8 /ext/sockets
parent1efe5b115788080b5d086fafd342322cee874eb5 (diff)
downloadphp-git-7bb52dda6a47565a2788575455726bd3214659d6.tar.gz
backport missing rev bfdc9e280515c1639dfe1d81ce6fc225d2cf1bc9
Diffstat (limited to 'ext/sockets')
-rw-r--r--ext/sockets/conversions.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/sockets/conversions.c b/ext/sockets/conversions.c
index 30e895d97b..eeec99f358 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);
}