From cd9d12d4c2b9132b4a3f726aef88d6e4ac9610dd Mon Sep 17 00:00:00 2001 From: Dmitry Volyntsev Date: Thu, 8 Aug 2019 14:19:54 +0300 Subject: [PATCH] Fixed njs_is_accessor_descriptor(). --- src/njs_object.h | 3 ++- src/njs_value.h | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/njs_object.h b/src/njs_object.h index cac3c08e..b9c6e2d3 100644 --- a/src/njs_object.h +++ b/src/njs_object.h @@ -13,7 +13,8 @@ #define njs_is_accessor_descriptor(prop) \ - (njs_is_valid(&(prop)->getter) || njs_is_valid(&(prop)->setter)) + (njs_is_function_or_undefined(&(prop)->getter) \ + || njs_is_function_or_undefined(&(prop)->setter)) #define njs_is_generic_descriptor(prop) \ diff --git a/src/njs_value.h b/src/njs_value.h index 853d3cf5..592269ef 100644 --- a/src/njs_value.h +++ b/src/njs_value.h @@ -537,6 +537,10 @@ typedef struct { ((value)->type == NJS_FUNCTION) +#define njs_is_function_or_undefined(value) \ + ((value)->type == NJS_FUNCTION || (value)->type == NJS_UNDEFINED) + + #define njs_is_regexp(value) \ ((value)->type == NJS_REGEXP) -- 2.47.3