Fixed native property hiding on V8 (Issue ClearFoundry#98).

ClearScriptLib · ClearScriptLib · commit e3f641f1a19b · 2016-01-20T08:33:09.000-05:00
diff --git a/ClearScript/V8/ClearScriptV8/V8ContextImpl.cpp b/ClearScript/V8/ClearScriptV8/V8ContextImpl.cpp
@@ -1305,6 +1305,7 @@ void V8ContextImpl::GetHostObjectProperty(v8::Local<v8::Name> hKey, const v8::Pr
             }
 
             auto hHolder = info.Holder();
+            auto cacheCleared = false;
 
             auto hAccessToken = hHolder->GetHiddenValue(pContextImpl->m_hAccessTokenName);
             if (pContextImpl->m_hAccessToken != hAccessToken)
@@ -1318,19 +1319,29 @@ void V8ContextImpl::GetHostObjectProperty(v8::Local<v8::Name> hKey, const v8::Pr
                     }
 
                     hHolder->SetHiddenValue(pContextImpl->m_hAccessTokenName, pContextImpl->m_hAccessToken);
+                    cacheCleared = true;
 
                 END_PULSE_VALUE_SCOPE
             }
 
-            auto hResult = hHolder->GetRealNamedProperty(hName);
-            if (hResult.IsEmpty())
+            v8::Local<v8::Value> hResult;
+            if (!cacheCleared)
             {
-                bool isCacheable;
-                hResult = pContextImpl->ImportValue(HostObjectHelpers::GetProperty(::GetHostObject(info.Holder()), StdString(hName), isCacheable));
-                if (isCacheable)
-                {
-                    hHolder->ForceSet(hName, hResult);
-                }
+                BEGIN_PULSE_VALUE_SCOPE(&pContextImpl->m_DisableHostObjectInterception, true)
+
+                    if (hHolder->HasOwnProperty(hName))
+                    {
+                        CALLBACK_RETURN(hResult);
+                    }
+
+                END_PULSE_VALUE_SCOPE
+            }
+
+            bool isCacheable;
+            hResult = pContextImpl->ImportValue(HostObjectHelpers::GetProperty(::GetHostObject(info.Holder()), StdString(hName), isCacheable));
+            if (isCacheable)
+            {
+                hHolder->ForceSet(hName, hResult);
             }
 
             CALLBACK_RETURN(hResult);
diff --git a/ClearScriptTest/BugFixTest.cs b/ClearScriptTest/BugFixTest.cs
@@ -1811,6 +1811,22 @@ public void BugFix_V8HostMethodClobbering()
             Assert.IsInstanceOfType(engine.Evaluate("host.newObj()"), typeof(PropertyBag));
         }
 
+        [TestMethod, TestCategory("BugFix")]
+        public void BugFix_V8NativePropertyHiding()
+        {
+            var foo = new { toString = new Func<string>(() => "testValue") };
+            engine.Script.foo = foo;
+            Assert.AreEqual(foo.toString(), engine.Evaluate("foo.toString()"));
+        }
+
+        [TestMethod, TestCategory("BugFix")]
+        public void BugFix_V8NativePropertyHiding_Method()
+        {
+            var foo = new HideNativeJavaScriptMethod();
+            engine.Script.foo = foo;
+            Assert.AreEqual(foo.toString(), engine.Evaluate("foo.toString()"));
+        }
+
         // ReSharper restore InconsistentNaming
 
         #endregion
@@ -2029,6 +2045,18 @@ public class NumericArgConversionTest
             public decimal? NullableDecimalProperty { get; set; }
         }
 
+        public class HideNativeJavaScriptMethod
+        {
+            // ReSharper disable InconsistentNaming
+
+            public string toString()
+            {
+                return ToString();
+            }
+
+            // ReSharper restore InconsistentNaming
+        }
+
         #endregion
     }
 }
