[Merge chakra-core/ChakraCore@3747582647] [1.6>1.7] [MERGE #3384 @aga…

…rwal-sandeep] OS#12654029: ArrayBuffer throw OOM if unable to allocate memory after GC Merge pull request #3384 from agarwal-sandeep:vso12654029
nodejs · Jul 19, 2017 · eb638cc · eb638cc
1 parent 64022f1
commit eb638cc
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 44 deletions.
diff --git a/deps/chakrashim/core/lib/Runtime/Library/ArrayBuffer.cpp b/deps/chakrashim/core/lib/Runtime/Library/ArrayBuffer.cpp
@@ -615,17 +615,17 @@ namespace Js
                         recycler->ReportExternalMemoryFailure(length);
                     }
                 }
-                else
-                {
-                    JavascriptError::ThrowOutOfMemoryError(GetScriptContext());
-                }
             }
 
             if (buffer != nullptr)
             {
                 bufferLength = length;
                 ZeroMemory(buffer, bufferLength);
             }
+            else
+            {
+                JavascriptError::ThrowOutOfMemoryError(GetScriptContext());
+            }
         }
     }
 

diff --git a/deps/chakrashim/core/test/es7/arraybuffer_constructor.js b/deps/chakrashim/core/test/es7/arraybuffer_constructor.js
diff --git a/deps/chakrashim/core/test/es7/rlexe.xml b/deps/chakrashim/core/test/es7/rlexe.xml
@@ -106,10 +106,4 @@
       <tags>exclude_amd64</tags>
     </default>
   </test>
-  <test>
-    <default>
-      <files>arraybuffer_constructor.js</files>
-      <tags>exclude_amd64</tags>
-    </default>
-  </test>
 </regress-exe>
diff --git a/deps/chakrashim/core/test/wasm/memory.js b/deps/chakrashim/core/test/wasm/memory.js
@@ -146,7 +146,7 @@ test({init: 0, max: 5});
 test({init: 0, max: 10});
 test({init: 5});
 test({init: 5, max: 10});
-test({init: 1 << 14, checkOOM: true});
+// test({init: 1 << 14, checkOOM: true}); // ArrayBuffer will throw OOM instead of returning a null buffer
 try {
   test({init: 1 << 15});
   print("Failed. Expected an error when allocating WebAssembly.Memory too big");