Fixed njs_is_accessor_descriptor().

diff --git a/src/njs_object.h b/src/njs_object.h
index cac3c08e3f6c938f6338ae247c17794ce6d1f080..b9c6e2d3f1e1146b2e94eaa7c379652e15e693b3 100644 (file)
--- 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 853d3cf54a86d038f02d7c25ec1bdb6f48e76e84..592269ef81dece14e30bc253ecba6c4ca147eef5 100644 (file)
--- 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)