Iterate only own properties

mozilla · Jul 10, 2020 · ec6ef6d · ec6ef6d
1 parent 4ebee6f
commit ec6ef6d
Showing 1 changed file with 15 additions and 5 deletions.
diff --git a/nunjucks/src/lib.js b/nunjucks/src/lib.js
@@ -196,19 +196,29 @@ function getAttrGetter(attribute, postprocess, defaultValue) {
   return function attrGetter(item) {
     let _item = item;
 
+    function rollback() {
+      _item = undefined;
+      if (defaultValue) {
+        _item = defaultValue;
+      }
+    }
+
     for (let i = 0; i < parts.length; i++) {
       const part = parts[i];
 
       // If item is not an object, and we still got parts to handle, it means
       // that something goes wrong. Just roll out to undefined or default value
       // in that case.
       try {
-        _item = _item[part];
-      } catch (e) {
-        _item = undefined;
-        if (defaultValue) {
-          _item = defaultValue;
+        if (hasOwnProp(_item, part)) {
+          _item = _item[part];
+        } else {
+          rollback();
+
+          break;
         }
+      } catch (e) {
+        rollback();
 
         break;
       }