address review feedback

chakra-core · Oct 2, 2018 · 03b79f7 · 03b79f7
1 parent 3826779
commit 03b79f7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/lib/Runtime/Language/JavascriptOperators.cpp b/lib/Runtime/Language/JavascriptOperators.cpp
@@ -1064,7 +1064,7 @@ using namespace Js;
     JavascriptArray* JavascriptOperators::GetOwnPropertyNames(Var instance, ScriptContext *scriptContext)
     {
         RecyclableObject *object = ToObject(instance, scriptContext);
-        AssertOrFailFast(VarIsCorrectType(object));
+        AssertOrFailFast(VarIsCorrectType(object)); // Consider moving this check into ToObject
         JavascriptProxy * proxy = JavascriptOperators::TryFromVar<JavascriptProxy>(instance);
         if (proxy)
         {

diff --git a/lib/Runtime/Language/i386/AsmJsJitTemplate.cpp b/lib/Runtime/Language/i386/AsmJsJitTemplate.cpp
@@ -551,11 +551,20 @@ namespace Js
         JavascriptArrayBuffer* arrayBuffer = asmJsFunc->GetAsmJsArrayBuffer();
         int arraySize = 0;
         BYTE* arrayPtr = nullptr;
+
         if (VarIsCorrectType<ArrayBuffer>(arrayBuffer))
         {
             arrayPtr = arrayBuffer->GetBuffer();
             arraySize = arrayBuffer->GetByteLength();
         }
+        else
+        {
+            // Null should be the only way to fail VarIsCorrectType
+            // TODO: just check for null above
+            Assert(arrayBuffer == nullptr);
+            arrayBuffer = nullptr;
+        }
+
         Var* m_localSlots;
         int* m_localIntSlots;
         double* m_localDoubleSlots;