Fix struct flock initialization

The code currently assumes there are no additional fields to a 'struct flock', but this is not necessarily true, for example on Solaris-derived systems. Signed-off-by: John Levon <[email protected]>
baudehlo · Jun 4, 2020 · 12a7a4e · 12a7a4e
1 parent 3125353
commit 12a7a4e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/fs-ext.cc b/fs-ext.cc
@@ -242,11 +242,8 @@ static void EIO_Fcntl(uv_work_t *req) {
   store_data_t* data = static_cast<store_data_t *>(req->data);
 
   struct flock lk;
-  lk.l_start = 0;
-  lk.l_len = 0;
-  lk.l_type = 0;
-  lk.l_whence = 0;
-  lk.l_pid = 0;
+
+  memset(&lk, '\0', sizeof (lk));
 
   int result = -1;
   if (data->oper == F_GETLK || data->oper == F_SETLK || data->oper == F_SETLKW) {

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -8,7 +8,7 @@
     "flock",
     "seek"
   ],
-  "version": "2.0.0",
+  "version": "2.0.1",
   "homepage": "https://github.com/baudehlo/node-fs-ext/",
   "repository": {
     "type": "git",