Merge 202211 "Rethrow cross-site exceptions as security errors"

Source/bindings/core/v8/V8DOMWrapper.h

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 93 matching lines @@
     }
     RELEASE_ASSERT_WITH_SECURITY_IMPLICATION(toScriptWrappable(wrapper) == ScriptWrappable::fromNode(node));
     return wrapper;
 }
 
 class V8WrapperInstantiationScope {
 public:
     V8WrapperInstantiationScope(v8::Local<v8::Object> creationContext, v8::Isolate* isolate, bool withSecurityCheck = true)
         : m_didEnterContext(false)
         , m_context(isolate->GetCurrentContext())
+        , m_tryCatch(isolate)
+        , m_convertExceptions(false)
     {
         // creationContext should not be empty. Because if we have an
         // empty creationContext, we will end up creating
         // a new object in the context currently entered. This is wrong.
         RELEASE_ASSERT(!creationContext.IsEmpty());
         v8::Local<v8::Context> contextForWrapper = creationContext->CreationContext();
+
         // For performance, we enter the context only if the currently running context
         // is different from the context that we are about to enter.
         if (contextForWrapper == m_context)
             return;
-        if (withSecurityCheck)
+        if (withSecurityCheck) {
             securityCheck(isolate, contextForWrapper);
+        } else {
+            m_convertExceptions = true;
+        }
         m_context = v8::Local<v8::Context>::New(isolate, contextForWrapper);
         m_didEnterContext = true;
         m_context->Enter();
     }
 
     ~V8WrapperInstantiationScope()
     {
-        if (!m_didEnterContext)
+        if (!m_didEnterContext) {
+            m_tryCatch.ReThrow();
             return;
+        }
         m_context->Exit();
+        // Rethrow any cross-context exceptions as security error.
+        if (m_tryCatch.HasCaught()) {
+            if (m_convertExceptions) {
+                m_tryCatch.Reset();
+                convertException();
+            }
+            m_tryCatch.ReThrow();
+        }
     }
 
     v8::Local<v8::Context> context() const { return m_context; }
 
 private:
     void securityCheck(v8::Isolate*, v8::Local<v8::Context> contextForWrapper);
+    void convertException();
 
     bool m_didEnterContext;
     v8::Local<v8::Context> m_context;
+    v8::TryCatch m_tryCatch;
+    bool m_convertExceptions;
 };
 
 } // namespace blink
 
 #endif // V8DOMWrapper_h