luo980/libuv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

unix: only undo fs req registration in async mode

Browse Source 
Commit 0199955 ("fs: undo uv__req_init when uv__malloc failed")
mistakingly unregisters the requests unconditionally in a few places,
resulting in memory corruption when it hasn't been registered first.

Fixes: https://github.com/libuv/libuv/pull/543
PR-URL: https://github.com/libuv/libuv/pull/567
Reviewed-By: Saúl Ibarra Corretgé <saghul@gmail.com>
This commit is contained in:
Ben Noordhuis 2015-10-09 13:14:24 +02:00
parent 822969ad2f
commit bf52579f92
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/unix/fs.c
View File

@ -1067,7 +1067,8 @@ int uv_fs_mkdtemp(uv_loop_t* loop,
INIT(MKDTEMP);
req->path = uv__strdup(tpl);
if (req->path == NULL) {
uv__req_unregister(loop, req);
if (cb != NULL)
uv__req_unregister(loop, req);
return -ENOMEM;
}
POST;
@ -1106,7 +1107,8 @@ int uv_fs_read(uv_loop_t* loop, uv_fs_t* req,
req->bufs = uv__malloc(nbufs * sizeof(*bufs));
if (req->bufs == NULL) {
uv__req_unregister(loop, req);
if (cb != NULL)
uv__req_unregister(loop, req);
return -ENOMEM;
}
@ -1233,7 +1235,8 @@ int uv_fs_write(uv_loop_t* loop,
req->bufs = uv__malloc(nbufs * sizeof(*bufs));
if (req->bufs == NULL) {
uv__req_unregister(loop, req);
if (cb != NULL)
uv__req_unregister(loop, req);
return -ENOMEM;
}