com php-src: Added missing return statements: ext/sockets/sendrecvmsg.c
| From: | Gustavo André dos Santos Lopes | Date: | Sat, 02 Feb 2013 15:38:06 +0000 |
| Subject: | com php-src: Added missing return statements: ext/sockets/sendrecvmsg.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-71139@lists.php.net to get a copy of this message | ||
Commit: 17540788ad8c25969f1dbd02c1a3b75a8417fe9c
Author: Gustavo Lopes <glopes@nebm.ist.utl.pt> Mon, 5 Nov 2012 11:36:00 +0100
Parents: 0f849fe2aa7c8894b2dbde57abd8a3a3aa8f764a
Branches: PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=17540788ad8c25969f1dbd02c1a3b75a8417fe9c
Log:
Added missing return statements
Changed paths:
M ext/sockets/sendrecvmsg.c
Diff:
diff --git a/ext/sockets/sendrecvmsg.c b/ext/sockets/sendrecvmsg.c
index e47bd46..3405215 100644
--- a/ext/sockets/sendrecvmsg.c
+++ b/ext/sockets/sendrecvmsg.c
@@ -918,6 +918,7 @@ static void from_zval_write_iov_array(const zval *arr, char *msghdr_c, ser_conte
if (Z_TYPE_P(arr) != IS_ARRAY) {
do_from_zval_err(ctx, "%s", "expected an array here");
+ return;
}
num_elem = zend_hash_num_elements(Z_ARRVAL_P(arr));
@@ -964,6 +965,7 @@ static void from_zval_write_controllen(const zval *elem, char *msghdr_c, ser_con
from_zval_write_uint32(elem, (char*)&len, ctx);
if (!ctx->err.has_error && len == 0) {
do_from_zval_err(ctx, "controllen cannot be 0");
+ return;
}
msghdr->msg_control = accounted_emalloc(len, ctx);
msghdr->msg_controllen = len;