backport missing rev bfdc9e2

weltling · weltling · commit 7bb52dda6a47 · 2015-06-25T11:34:04.000+02:00
diff --git 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);
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -910,7 +910,7 @@ static void from_zval_write_control(const zval *arr,`
`910`	`910`	`if (space_left < req_space) {`
`911`	`911`	`control_buf = safe_erealloc(control_buf, 2, req_space, *control_len);`
`912`	`912`	`control_len += 2 req_space;`
`913`		`- memset(control_buf + offset, '\0', control_len - offset);`
	`913`	`+ memset((char )control_buf + offset, '\0', control_len - *offset);`
`914`	`914`	`memcpy(&alloc->data, control_buf, sizeof *control_buf);`
`915`	`915`	`}`
`916`	`916`