From b5bf97c657051fa884a81f9f12aa73245f5f2400 Mon Sep 17 00:00:00 2001
From: Zoltan Herczeg <zherczeg.u-szeged@partner.samsung.com>
Date: Tue, 26 Jan 2021 14:57:10 +0100
Subject: [PATCH] Stop after the first matching property in the prototype chain
 (#4543)

If multiple properties with the same name is in the
prototype chain, only the first one should be inspected

JerryScript-DCO-1.0-Signed-off-by: Zoltan Herczeg zherczeg.u-szeged@partner.samsung.com
---
 jerry-core/ecma/operations/ecma-objects.c |  8 ++--
 tests/jerry/object-prototype-property.js  | 53 +++++++++++++++++++++++
 2 files changed, 57 insertions(+), 4 deletions(-)
 create mode 100644 tests/jerry/object-prototype-property.js

diff --git a/jerry-core/ecma/operations/ecma-objects.c b/jerry-core/ecma/operations/ecma-objects.c
index 9105cbd44..40bebf508 100644
--- a/jerry-core/ecma/operations/ecma-objects.c
+++ b/jerry-core/ecma/operations/ecma-objects.c
@@ -1531,11 +1531,11 @@ ecma_op_object_put_with_receiver (ecma_object_t *object_p, /**< the object */
         {
           setter_cp = ecma_get_named_accessor_property (property_ref.value_p)->setter_cp;
           create_new_property = false;
+          break;
         }
-        else
-        {
-          create_new_property = ecma_is_property_writable (inherited_property);
-        }
+
+        create_new_property = ecma_is_property_writable (inherited_property);
+        break;
       }
     }
 
diff --git a/tests/jerry/object-prototype-property.js b/tests/jerry/object-prototype-property.js
new file mode 100644
index 000000000..5f305906e
--- /dev/null
+++ b/tests/jerry/object-prototype-property.js
@@ -0,0 +1,53 @@
+// Copyright JS Foundation and other contributors, http://js.foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Tests that if multiple properties with the same name is
+// in the prototype chain, only the first one is inspected
+
+var not_called = 0;
+var called = 0;
+
+function accessor_proto() {
+  Object.defineProperty(this, "prop",
+    { get: function() { return 3.5 }, set: function(v) { called++ } }
+  )
+}
+
+function data_proto() {
+  Object.defineProperty(this, "prop",
+    { value:7, writable:true }
+  )
+}
+
+accessor_proto.prototype = { get prop() { not_called++ }, set prop(v) { not_called++ } }
+data_proto.prototype = accessor_proto.prototype
+
+function create_accessor() {}
+function create_data() {}
+
+create_accessor.prototype = new accessor_proto();
+create_data.prototype = new data_proto();
+
+var o = new create_accessor()
+o.prop = 1
+assert(o.prop === 3.5)
+assert(Object.getPrototypeOf(o) === create_accessor.prototype)
+
+o = new create_data()
+o.prop = 'X'
+assert(o.prop === 'X')
+assert(Object.getPrototypeOf(o) === create_data.prototype)
+
+assert(not_called === 0)
+assert(called === 1)