Merge branch 'PHP-5.5' into PHP-5.6

sgolemon · sgolemon · commit c4dd65c723a0 · 2015-06-17T13:34:33.000-07:00
* PHP-5.5:
  Fix buffer growth in sockets/conversion.c
diff --git a/ext/sockets/conversions.c b/ext/sockets/conversions.c
@@ -910,8 +910,8 @@ 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, '\0', *control_len - *offset);
-		memcpy(&alloc->data, *control_buf, sizeof *control_buf);
+		memset(*control_buf + *offset, '\0', *control_len - *offset);
+		memcpy(&alloc->data, control_buf, sizeof *control_buf);
 	}
 
 	cmsghdr = (struct cmsghdr*)(((char*)*control_buf) + *offset);
