From: Dmitry Volyntsev <xeioex@nginx.com>
Date: Wed, 4 Sep 2024 04:32:33 +0000 (-0700)
Subject: Fixed handling of encode arg in fs.readdir() and fs.realpath().
X-Git-Tag: 0.8.6~8
X-Git-Url: http://git.kaiwu.me/postgresql/log/contrib/postgres_fdw/static/gitweb.js?a=commitdiff_plain;h=6259cca26b6747fa8ade15c4b602b9ad190cb14a;p=njs.git

Fixed handling of encode arg in fs.readdir() and fs.realpath().

The issue was introduced in 98c6570f3 (0.8.0).
---

diff --git a/external/njs_fs_module.c b/external/njs_fs_module.c
index 5f9a48e2..de378cee 100644
--- a/external/njs_fs_module.c
+++ b/external/njs_fs_module.c
@@ -1940,14 +1940,19 @@ njs_fs_readdir(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs,
 
     encoding = NULL;
 
-    if (!njs_value_is_string(njs_value_arg(&encode))) {
+
+    if (njs_value_is_string(njs_value_arg(&encode))) {
         njs_value_string_get(njs_value_arg(&encode), &s);
 
-        if (!njs_strstr_eq(&s, &string_buffer)) {
-            encoding = njs_buffer_encoding(vm, njs_value_arg(&encode), 1);
-            if (njs_slow_path(encoding == NULL)) {
-                return NJS_ERROR;
-            }
+    } else {
+        s.length = 0;
+        s.start = NULL;
+    }
+
+    if (!njs_strstr_eq(&s, &string_buffer)) {
+        encoding = njs_buffer_encoding(vm, njs_value_arg(&encode), 1);
+        if (njs_slow_path(encoding == NULL)) {
+            return NJS_ERROR;
         }
     }
 
@@ -2080,14 +2085,18 @@ njs_fs_realpath(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs,
 
     encoding = NULL;
 
-    if (!njs_value_is_string(njs_value_arg(&encode))) {
+    if (njs_value_is_string(njs_value_arg(&encode))) {
         njs_value_string_get(njs_value_arg(&encode), &s);
 
-        if (!njs_strstr_eq(&s, &string_buffer)) {
-            encoding = njs_buffer_encoding(vm, njs_value_arg(&encode), 1);
-            if (njs_slow_path(encoding == NULL)) {
-                return NJS_ERROR;
-            }
+    } else {
+        s.length = 0;
+        s.start = NULL;
+    }
+
+    if (!njs_strstr_eq(&s, &string_buffer)) {
+        encoding = njs_buffer_encoding(vm, njs_value_arg(&encode), 1);
+        if (njs_slow_path(encoding == NULL)) {
+            return NJS_ERROR;
         }
     }