Merge branch 'PHP-5.6'

* PHP-5.6:
  Fix buffer growth in sockets/conversion.c
  Implements extended error messages

1 files changed, 2 insertions, 2 deletions

diff --git a/ext/sockets/conversions.c b/ext/sockets/conversions.c
index f6a86315b1..7467c1f369 100644
--- a/ext/sockets/conversions.c
+++ b/ext/sockets/conversions.c
@@ -889,8 +889,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);