c/libuv
1
0
Fork 0
mirror of https://github.com/libuv/libuv synced 2025-03-28 21:13:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

unix,win: more uv_read_start() argument validation

Browse Source 
Return `UV_EINVAL` when one or more arguments are NULL.

Fixes: https://github.com/libuv/help/issues/137
PR-URL: https://github.com/libuv/libuv/pull/2795
Reviewed-By: Jameson Nash <vtjnash@gmail.com>
Reviewed-By: Santiago Gimeno <santiago.gimeno@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Bartosz Sosnowski <bartosz@janeasystems.com>
This commit is contained in:
Ben Noordhuis 2020-06-08 09:03:29 +02:00 committed by Jameson Nash
parent 06b7317422
commit 48cf8c8286
4 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/uv-common.c
View File

@ -835,6 +835,9 @@ void uv_loop_delete(uv_loop_t* loop) {
int uv_read_start(uv_stream_t* stream,
uv_alloc_cb alloc_cb,
uv_read_cb read_cb) {
if (stream == NULL || alloc_cb == NULL || read_cb == NULL)
return UV_EINVAL;
if (stream->flags & UV_HANDLE_CLOSING)
return UV_EINVAL;

8
test/test-pipe-getsockname.c
View File

@ -225,7 +225,9 @@ TEST_IMPL(pipe_getsockname_blocking) {
ASSERT(r != -1);
r = uv_pipe_open(&pipe_client, readfd);
ASSERT(r == 0);
r = uv_read_start((uv_stream_t*)&pipe_client, NULL, NULL);
r = uv_read_start((uv_stream_t*) &pipe_client,
(uv_alloc_cb) abort,
(uv_read_cb) abort);
ASSERT(r == 0);
Sleep(100);
r = uv_read_stop((uv_stream_t*)&pipe_client);
@ -236,7 +238,9 @@ TEST_IMPL(pipe_getsockname_blocking) {
ASSERT(r == 0);
ASSERT(len1 == 0); /* It's an annonymous pipe. */
r = uv_read_start((uv_stream_t*)&pipe_client, NULL, NULL);
r = uv_read_start((uv_stream_t*)&pipe_client,
(uv_alloc_cb) abort,
(uv_read_cb) abort);
ASSERT(r == 0);
Sleep(100);

3
test/test-shutdown-eof.c
View File

@ -93,6 +93,9 @@ static void connect_cb(uv_connect_t *req, int status) {
/* Check error handling. */
ASSERT_EQ(UV_EALREADY, uv_read_start((uv_stream_t*)&tcp, alloc_cb, read_cb));
ASSERT_EQ(UV_EINVAL, uv_read_start(NULL, alloc_cb, read_cb));
ASSERT_EQ(UV_EINVAL, uv_read_start((uv_stream_t*)&tcp, NULL, read_cb));
ASSERT_EQ(UV_EINVAL, uv_read_start((uv_stream_t*)&tcp, alloc_cb, NULL));
/*
* Write the letter 'Q' to gracefully kill the echo-server. This will not

4
test/test-tcp-bind-error.c
View File

@ -283,7 +283,9 @@ TEST_IMPL(tcp_bind_writable_flags) {
ASSERT(r == UV_EPIPE);
r = uv_shutdown(&shutdown_req, (uv_stream_t*) &server, NULL);
ASSERT(r == UV_ENOTCONN);
r = uv_read_start((uv_stream_t*) &server, NULL, NULL);
r = uv_read_start((uv_stream_t*) &server,
(uv_alloc_cb) abort,
(uv_read_cb) abort);
ASSERT(r == UV_ENOTCONN);
uv_close((uv_handle_t*)&server, close_cb);