summaryrefslogtreecommitdiff
path: root/src/node_file.cc
diff options
context:
space:
mode:
authorGuy Bedford <guybedford@gmail.com>2019-11-04 19:40:11 -0500
committerRich Trott <rtrott@gmail.com>2019-11-08 04:50:02 -0800
commit1eee0b8bf8bba39b600fb16a9223e545e3bac2bc (patch)
treedf49e969413c50723e7ffad9dc41b79069aff100 /src/node_file.cc
parent632caddf2ca9b9c9c3a9834482fd25395e12075f (diff)
downloadandroid-node-v8-1eee0b8bf8bba39b600fb16a9223e545e3bac2bc.tar.gz
android-node-v8-1eee0b8bf8bba39b600fb16a9223e545e3bac2bc.tar.bz2
android-node-v8-1eee0b8bf8bba39b600fb16a9223e545e3bac2bc.zip
module: fix for empty object in InternalModuleReadJSON
Fixes: https://github.com/nodejs/node/issues/30245 PR-URL: https://github.com/nodejs/node/pull/30256 Reviewed-By: Myles Borins <myles.borins@gmail.com> Reviewed-By: Jan Krems <jan.krems@gmail.com>
Diffstat (limited to 'src/node_file.cc')
-rw-r--r--src/node_file.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/node_file.cc b/src/node_file.cc
index 8b6a90989f..48b382986c 100644
--- a/src/node_file.cc
+++ b/src/node_file.cc
@@ -18,7 +18,6 @@
// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
// USE OR OTHER DEALINGS IN THE SOFTWARE.
-
#include "node_file.h"
#include "aliased_buffer.h"
#include "memory_tracker-inl.h"
@@ -787,7 +786,7 @@ static void InternalModuleReadJSON(const FunctionCallbackInfo<Value>& args) {
size == SearchString(&chars[start], size, "\"main\"") &&
size == SearchString(&chars[start], size, "\"exports\"") &&
size == SearchString(&chars[start], size, "\"type\""))) {
- return;
+ args.GetReturnValue().Set(env->empty_object_string());
} else {
Local<String> chars_string =
String::NewFromUtf8(isolate,