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

fs: undo uv__req_init when uv__malloc failed

Browse Source 
PR-URL: https://github.com/libuv/libuv/pull/543
Reviewed-By: Saúl Ibarra Corretgé <saghul@gmail.com>
This commit is contained in:
Jianghua Yang 2015-09-23 16:37:40 +08:00 committed by Saúl Ibarra Corretgé
parent 25506bb331
commit 01999559cf
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/unix/fs.c
View File

@ -80,8 +80,10 @@
req->path = path; \ req->path = path; \
} else { \ } else { \
req->path = uv__strdup(path); \ req->path = uv__strdup(path); \
if (req->path == NULL) \ if (req->path == NULL) { \
uv__req_unregister(loop, req); \
return -ENOMEM; \ return -ENOMEM; \
} \
} \ } \
} \ } \
while (0) while (0)
@ -97,8 +99,10 @@
path_len = strlen(path) + 1; \ path_len = strlen(path) + 1; \
new_path_len = strlen(new_path) + 1; \ new_path_len = strlen(new_path) + 1; \
req->path = uv__malloc(path_len + new_path_len); \ req->path = uv__malloc(path_len + new_path_len); \
if (req->path == NULL) \ if (req->path == NULL) { \
uv__req_unregister(loop, req); \
return -ENOMEM; \ return -ENOMEM; \
} \
req->new_path = req->path + path_len; \ req->new_path = req->path + path_len; \
memcpy((void*) req->path, path, path_len); \ memcpy((void*) req->path, path, path_len); \
memcpy((void*) req->new_path, new_path, new_path_len); \ memcpy((void*) req->new_path, new_path, new_path_len); \
@ -1062,8 +1066,10 @@ int uv_fs_mkdtemp(uv_loop_t* loop,
uv_fs_cb cb) { uv_fs_cb cb) {
INIT(MKDTEMP); INIT(MKDTEMP);
req->path = uv__strdup(tpl); req->path = uv__strdup(tpl);
if (req->path == NULL) if (req->path == NULL) {
uv__req_unregister(loop, req);
return -ENOMEM; return -ENOMEM;
}
POST; POST;
} }
@ -1099,8 +1105,10 @@ int uv_fs_read(uv_loop_t* loop, uv_fs_t* req,
if (nbufs > ARRAY_SIZE(req->bufsml)) if (nbufs > ARRAY_SIZE(req->bufsml))
req->bufs = uv__malloc(nbufs * sizeof(*bufs)); req->bufs = uv__malloc(nbufs * sizeof(*bufs));
if (req->bufs == NULL) if (req->bufs == NULL) {
uv__req_unregister(loop, req);
return -ENOMEM; return -ENOMEM;
}
memcpy(req->bufs, bufs, nbufs * sizeof(*bufs)); memcpy(req->bufs, bufs, nbufs * sizeof(*bufs));
@ -1224,8 +1232,10 @@ int uv_fs_write(uv_loop_t* loop,
if (nbufs > ARRAY_SIZE(req->bufsml)) if (nbufs > ARRAY_SIZE(req->bufsml))
req->bufs = uv__malloc(nbufs * sizeof(*bufs)); req->bufs = uv__malloc(nbufs * sizeof(*bufs));
if (req->bufs == NULL) if (req->bufs == NULL) {
uv__req_unregister(loop, req);
return -ENOMEM; return -ENOMEM;
}
memcpy(req->bufs, bufs, nbufs * sizeof(*bufs)); memcpy(req->bufs, bufs, nbufs * sizeof(*bufs));