com php-src: Fix bug in from_zval_write_control_array (): ext/sockets/sendrecvmsg.c
| From: | Gustavo André dos Santos Lopes | Date: | Sat, 02 Feb 2013 15:38:05 +0000 |
| Subject: | com php-src: Fix bug in from_zval_write_control_array (): ext/sockets/sendrecvmsg.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-71142@lists.php.net to get a copy of this message | ||
Commit: b27c22d627e342687eb0c21bac8859ea1d91b54b
Author: Gustavo Lopes <glopes@nebm.ist.utl.pt> Fri, 2 Nov 2012 17:53:48 +0100
Parents: b06f00477ce4f20516c6f727797f208ffaefcae9
Branches: PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=b27c22d627e342687eb0c21bac8859ea1d91b54b
Log:
Fix bug in from_zval_write_control_array()
Changed paths:
M ext/sockets/sendrecvmsg.c
Diff:
diff --git a/ext/sockets/sendrecvmsg.c b/ext/sockets/sendrecvmsg.c
index 837ae23..0489e97 100644
--- a/ext/sockets/sendrecvmsg.c
+++ b/ext/sockets/sendrecvmsg.c
@@ -792,7 +792,7 @@ static void from_zval_write_control_array(const zval *arr, char *msghdr_c, ser_c
}
msg->msg_control = control_buf;
- msg->msg_controllen = control_len;
+ msg->msg_controllen = cur_offset; /* not control_len, which may be larger */
}
static void to_zval_read_cmsg_data(const char *cmsghdr_c, zval *zv, res_context *ctx)
{