From 5c76b3f558faf38bb421bd7e72c07d30ea7a9de3 Mon Sep 17 00:00:00 2001 From: Ruben Ayrapetyan Date: Fri, 15 May 2015 17:43:43 +0300 Subject: [PATCH] Fixing ecma_op_from_property_descriptor semantics (type check for input property descriptor was implemented incorrectly). Related issue: https://github.com/Samsung/jerryscript/issues/70 JerryScript-DCO-1.0-Signed-off-by: Ruben Ayrapetyan r.ayrapetyan@samsung.com --- jerry-core/ecma/operations/ecma-conversion.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/jerry-core/ecma/operations/ecma-conversion.cpp b/jerry-core/ecma/operations/ecma-conversion.cpp index b00d34819..06b9f49d3 100644 --- a/jerry-core/ecma/operations/ecma-conversion.cpp +++ b/jerry-core/ecma/operations/ecma-conversion.cpp @@ -449,8 +449,8 @@ ecma_op_from_property_descriptor (const ecma_property_descriptor_t* src_prop_des } // 3. - if (prop_desc.is_value_defined - || prop_desc.is_writable_defined) + if (src_prop_desc_p->is_value_defined + || src_prop_desc_p->is_writable_defined) { JERRY_ASSERT (prop_desc.is_value_defined && prop_desc.is_writable_defined); @@ -481,7 +481,8 @@ ecma_op_from_property_descriptor (const ecma_property_descriptor_t* src_prop_des else { // 4. - JERRY_ASSERT (prop_desc.is_get_defined && prop_desc.is_set_defined); + JERRY_ASSERT (src_prop_desc_p->is_get_defined + && src_prop_desc_p->is_set_defined); // a. if (src_prop_desc_p->get_p == NULL)