From: Dmitry Volyntsev <xeioex@nginx.com>
Date: Thu, 23 Dec 2021 14:28:12 +0000 (+0000)
Subject: Fixed 1-byte memory over-read introduced in previous commit.
X-Git-Tag: 0.7.1~10
X-Git-Url: http://www.kaiwu.me/postgresql/commit/?a=commitdiff_plain;h=070b998046de5528bcc6df7f17c443584c2014ac;p=njs.git

Fixed 1-byte memory over-read introduced in previous commit.

sizeof("\0") returns 2 because of the implicit zero byte added at
the end of string literals. Instead njs_length() was intended to be
used.
---

diff --git a/external/njs_fs.c b/external/njs_fs.c
index d0cd4bf9..4333abea 100644
--- a/external/njs_fs.c
+++ b/external/njs_fs.c
@@ -2153,7 +2153,7 @@ njs_ftw(char *path, njs_file_tree_walk_cb_t cb, int fd_limit,
             }
 
             path[base] = '/';
-            memcpy(&path[base + 1], d_name, length + sizeof("\0"));
+            memcpy(&path[base + 1], d_name, length + njs_length("\0"));
 
             if (fd_limit != 0) {
                 ret = njs_ftw(path, cb, fd_limit - 1, flags, &trace);