details: https://hg.nginx.org/njs/rev/21b7a2d31852
branches:
changeset: 1125:21b7a2d31852
user: Dmitry Volyntsev <xeioex@nginx.com>
date: Tue Aug 13 15:15:42 2019 +0300
description:
Fixed dead store assignment in njs_fs_rename_sync().

Found by clang static analyzer.

diffstat:

src/njs_fs.c | 38 +++++++++++---------------------------
1 files changed, 11 insertions(+), 27 deletions(-)

diffs (92 lines):

diff -r 5f2162f7c3df -r 21b7a2d31852 src/njs_fs.c
--- a/src/njs_fs.c Mon Aug 12 21:04:50 2019 +0300
+++ b/src/njs_fs.c Tue Aug 13 15:15:42 2019 +0300
@@ -273,12 +273,8 @@ done:
}

if (description != 0) {
- ret = njs_fs_error(vm, syscall, description, &args[1], errn,
- &arguments[1]);
-
- if (njs_slow_path(ret != NJS_OK)) {
- return NJS_ERROR;
- }
+ (void) njs_fs_error(vm, syscall, description, &args[1], errn,
+ &arguments[1]);

njs_set_undefined(&arguments[2]);

@@ -497,10 +493,8 @@ done:
}

if (description != 0) {
- (void) njs_fs_error(vm, syscall, description, &args[1], errn,
+ return njs_fs_error(vm, syscall, description, &args[1], errn,
&vm->retval);
-
- return NJS_ERROR;
}

return NJS_OK;
@@ -714,12 +708,8 @@ done:
}

if (description != 0) {
- ret = njs_fs_error(vm, syscall, description, &args[1], errn,
- &arguments[1]);
-
- if (njs_slow_path(ret != NJS_OK)) {
- return NJS_ERROR;
- }
+ (void) njs_fs_error(vm, syscall, description, &args[1], errn,
+ &arguments[1]);

} else {
njs_set_undefined(&arguments[1]);
@@ -891,12 +881,8 @@ done:
}

if (description != 0) {
- ret = njs_fs_error(vm, syscall, description, &args[1], errn,
- &vm->retval);
-
- if (njs_slow_path(ret != NJS_OK)) {
- return NJS_ERROR;
- }
+ return njs_fs_error(vm, syscall, description, &args[1], errn,
+ &vm->retval);

} else {
njs_set_undefined(&vm->retval);
@@ -935,9 +921,8 @@ njs_fs_rename_sync(njs_vm_t *vm, njs_val

ret = rename(old_path, new_path);
if (njs_slow_path(ret != 0)) {
- ret = njs_fs_error(vm, "rename", strerror(errno), NULL, errno,
- &vm->retval);
- return NJS_ERROR;
+ return njs_fs_error(vm, "rename", strerror(errno), NULL, errno,
+ &vm->retval);
}

njs_set_undefined(&vm->retval);
@@ -972,9 +957,8 @@ njs_fs_fd_read(njs_vm_t *vm, njs_value_t
n = read(fd, p, end - p);

if (njs_slow_path(n < 0)) {
- (void) njs_fs_error(vm, "read", strerror(errno), path, errno,
+ return njs_fs_error(vm, "read", strerror(errno), path, errno,
&vm->retval);
- return NJS_ERROR;
}

p += n;
@@ -1101,7 +1085,7 @@ njs_fs_error(njs_vm_t *vm, const char *s

njs_set_type_object(retval, error, NJS_OBJECT_ERROR);

- return NJS_OK;
+ return NJS_ERROR;
}


_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel