[MERGE #5391 @kfukuda2] Fixing null ScriptContext issue in JavascriptWeakMap

Kenji Fukuda · Kenji Fukuda · commit 6c24c811f022 · 2018-06-28T15:37:07.000-07:00
Merge pull request #5391 from kfukuda2:KeyGetLibraryBug Fixes OS: 18010051 Fixing issue where ScriptContext can be null if closed before JavascriptWeakMap gets finalized
diff --git a/lib/Runtime/Library/JavascriptWeakMap.cpp b/lib/Runtime/Library/JavascriptWeakMap.cpp
@@ -42,7 +42,7 @@ namespace Js
             return nullptr;
         }
 
-        if (key->GetScriptContext()->GetLibrary()->GetUndefined() == weakMapKeyData)
+        if (key->GetLibrary()->GetUndefined() == weakMapKeyData)
         {
             return nullptr;
         }

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ namespace Js`
`42`	`42`	`return nullptr;`
`43`	`43`	`}`
`44`	`44`
`45`		`- if (key->GetScriptContext()->GetLibrary()->GetUndefined() == weakMapKeyData)`
	`45`	`+ if (key->GetLibrary()->GetUndefined() == weakMapKeyData)`
`46`	`46`	`{`
`47`	`47`	`return nullptr;`
`48`	`48`	`}`