From 3ae2db286ec0c6e095e166c3efd95929ff7f51ac Mon Sep 17 00:00:00 2001 From: Michael Dawson Date: Thu, 23 Mar 2023 15:53:16 -0400 Subject: [PATCH 1/3] src: fix some recently introduced coverity issues Signed-off-by: Michael Dawson --- src/dataqueue/queue.cc | 4 ++-- test/embedding/embedtest.cc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/dataqueue/queue.cc b/src/dataqueue/queue.cc index 7cf066a7185913..a910227d41ba4f 100644 --- a/src/dataqueue/queue.cc +++ b/src/dataqueue/queue.cc @@ -787,7 +787,7 @@ class FdEntry final : public EntryImpl { public: static std::unique_ptr Create(Environment* env, Local path) { // We're only going to create the FdEntry if the file exists. - uv_fs_t req; + uv_fs_t req = {0}; auto cleanup = OnScopeLeave([&] { uv_fs_req_cleanup(&req); }); auto buf = std::make_shared(env->isolate(), path); @@ -849,7 +849,7 @@ class FdEntry final : public EntryImpl { } static bool CheckModified(FdEntry* entry, int fd) { - uv_fs_t req; + uv_fs_t req = {0}; auto cleanup = OnScopeLeave([&] { uv_fs_req_cleanup(&req); }); // TODO(jasnell): Note the use of a sync fs call here is a bit unfortunate. // Doing this asynchronously creates a bit of a race condition tho, a file diff --git a/test/embedding/embedtest.cc b/test/embedding/embedtest.cc index bd639368acdf86..968e2251d81925 100644 --- a/test/embedding/embedtest.cc +++ b/test/embedding/embedtest.cc @@ -75,7 +75,7 @@ int RunNodeInstance(MultiIsolatePlatform* platform, if (snapshot_as_file_it != args.end()) { snapshot = node::EmbedderSnapshotData::FromFile(fp); } else { - uv_fs_t req; + uv_fs_t req = {0}; int statret = uv_fs_stat(nullptr, &req, filename, nullptr); assert(statret == 0); size_t filesize = req.statbuf.st_size; From d68c62ede8b22a1b7af6ead8dd7e2d9ce7fd6ffe Mon Sep 17 00:00:00 2001 From: Michael Dawson Date: Thu, 23 Mar 2023 18:07:11 -0400 Subject: [PATCH 2/3] squash: update initialization to avoid warnings Signed-off-by: Michael Dawson --- src/dataqueue/queue.cc | 4 ++-- test/embedding/embedtest.cc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/dataqueue/queue.cc b/src/dataqueue/queue.cc index a910227d41ba4f..8224b82eba2e7c 100644 --- a/src/dataqueue/queue.cc +++ b/src/dataqueue/queue.cc @@ -787,7 +787,7 @@ class FdEntry final : public EntryImpl { public: static std::unique_ptr Create(Environment* env, Local path) { // We're only going to create the FdEntry if the file exists. - uv_fs_t req = {0}; + uv_fs_t req = uv_fs_t(); auto cleanup = OnScopeLeave([&] { uv_fs_req_cleanup(&req); }); auto buf = std::make_shared(env->isolate(), path); @@ -849,7 +849,7 @@ class FdEntry final : public EntryImpl { } static bool CheckModified(FdEntry* entry, int fd) { - uv_fs_t req = {0}; + uv_fs_t req = uv_fs_t(); auto cleanup = OnScopeLeave([&] { uv_fs_req_cleanup(&req); }); // TODO(jasnell): Note the use of a sync fs call here is a bit unfortunate. // Doing this asynchronously creates a bit of a race condition tho, a file diff --git a/test/embedding/embedtest.cc b/test/embedding/embedtest.cc index 968e2251d81925..57bcecea232ddf 100644 --- a/test/embedding/embedtest.cc +++ b/test/embedding/embedtest.cc @@ -75,7 +75,7 @@ int RunNodeInstance(MultiIsolatePlatform* platform, if (snapshot_as_file_it != args.end()) { snapshot = node::EmbedderSnapshotData::FromFile(fp); } else { - uv_fs_t req = {0}; + uv_fs_t req = uv_fs_t(); int statret = uv_fs_stat(nullptr, &req, filename, nullptr); assert(statret == 0); size_t filesize = req.statbuf.st_size; From 6e496bd4bb7dc8d3eb540898aff4a7cd8d7950c0 Mon Sep 17 00:00:00 2001 From: Michael Dawson Date: Thu, 23 Mar 2023 18:13:59 -0400 Subject: [PATCH 3/3] squash: run make format-cpp Signed-off-by: Michael Dawson --- test/embedding/embedtest.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/embedding/embedtest.cc b/test/embedding/embedtest.cc index 57bcecea232ddf..3592ccb9813228 100644 --- a/test/embedding/embedtest.cc +++ b/test/embedding/embedtest.cc @@ -75,7 +75,7 @@ int RunNodeInstance(MultiIsolatePlatform* platform, if (snapshot_as_file_it != args.end()) { snapshot = node::EmbedderSnapshotData::FromFile(fp); } else { - uv_fs_t req = uv_fs_t(); + uv_fs_t req = uv_fs_t(); int statret = uv_fs_stat(nullptr, &req, filename, nullptr); assert(statret == 0); size_t filesize = req.statbuf.st_size;