Fixing ecma_op_from_property_descriptor semantics (type check for input property descriptor was implemented incorrectly).

Ruben Ayrapetyan · Ruben Ayrapetyan · commit 534f62065c30 · 2015-05-15T18:31:30.000+03:00
Related issue: #70 JerryScript-DCO-1.0-Signed-off-by: Ruben Ayrapetyan r.ayrapetyan@samsung.com
diff --git 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)

Original file line number	Diff line number	Diff line change
`@@ -449,8 +449,8 @@ ecma_op_from_property_descriptor (const ecma_property_descriptor_t* src_prop_des`
`449`	`449`	`}`
`450`	`450`
`451`	`451`	`// 3.`
`452`		`- if (prop_desc.is_value_defined`
`453`		`- \|\| prop_desc.is_writable_defined)`
	`452`	`+ if (src_prop_desc_p->is_value_defined`
	`453`	`+ \|\| src_prop_desc_p->is_writable_defined)`
`454`	`454`	`{`
`455`	`455`	`JERRY_ASSERT (prop_desc.is_value_defined && prop_desc.is_writable_defined);`
`456`	`456`
`@@ -481,7 +481,8 @@ ecma_op_from_property_descriptor (const ecma_property_descriptor_t* src_prop_des`
`481`	`481`	`else`
`482`	`482`	`{`
`483`	`483`	`// 4.`
`484`		`- JERRY_ASSERT (prop_desc.is_get_defined && prop_desc.is_set_defined);`
	`484`	`+ JERRY_ASSERT (src_prop_desc_p->is_get_defined`
	`485`	`+ && src_prop_desc_p->is_set_defined);`
`485`	`486`
`486`	`487`	`// a.`
`487`	`488`	`if (src_prop_desc_p->get_p == NULL)`