Fix GetCookieManager 'browser' param NULL exception (cztomczak#429)

cztomczak · cztomczak · commit c5469572802c · 2018-05-25T20:57:15.000+02:00
diff --git a/api/RequestHandler.md b/api/RequestHandler.md
@@ -206,6 +206,9 @@ is the URL of the top-level frame. Cookies managers can be unique
 per browser or shared across multiple browsers. The global cookie
 manager will be used if this method returns None.
 
+**IMPORTANT**: In some cases the `browser` parameter can be
+None, so you should handle such case.
+
 To successfully implement separate cookie manager per browser session,
 you have to set ApplicationSettings.`unique_request_context_per_browser`
 to True. Otherwise the browser param passed to this callback will
@@ -221,9 +224,6 @@ the window on your own and embed browser in it.
 The `CreateAnotherBrowser` function from the old v31 wxpython
 example does that.
 
-IMPORTANT: in an exceptional case the `browser` parameter could be
-None, so you should handle such case. During testing this issue did
-not occur, but it may happen in some yet unknown scenarios.
 
 
 ### OnProtocolExecution
diff --git a/docs/Migration-guide.md b/docs/Migration-guide.md
@@ -44,6 +44,7 @@ Table of contents:
 * [v66+ BrowserSettings.javascript_open_windows_disallowed option was removed](#v66-browsersettingsjavascript_open_windows_disallowed-option-was-removed)
 * [v66+ Threads removed: TID_DB, TID_PROCESS_LAUNCHER, TID_CACHE](#v66-threads-removed-tid_db-tid_process_launcher-tid_cache)
 * [v66+ cef.Request.Flags changed](#v66-cefrequestflags-changed)
+* [v66+ RequestHandler.GetCookieManager 'browser' param may be None](#v66-requesthandlergetcookiemanager-browser-param-may-be-none)
 
 
 
@@ -376,3 +377,10 @@ Flags added:
 See a complete list of flags in the description of
 cef.Request.[GetFlags](../api/Request.md#getflags) method.
 
+
+## v66+ RequestHandler.GetCookieManager 'browser' param may be None
+
+In some cases in RequestHandler.[GetCookieManager](../api/RequestHandler.md#getcookiemanager)
+callback, the `browser` parameter may be None due to a race condition.
+See Issue [#429](../../../issues/429) for details.
+
diff --git a/src/handlers/request_handler.pyx b/src/handlers/request_handler.pyx
@@ -291,7 +291,10 @@ cdef public CefRefPtr[CefCookieManager] RequestHandler_GetCookieManager(
     cdef object clientCallback
     cdef PyCookieManager returnValue
     try:
-        pyBrowser = GetPyBrowser(cefBrowser, "GetCookieManager")
+        if cefBrowser.get():
+            pyBrowser = GetPyBrowser(cefBrowser, "GetCookieManager")
+        else:
+            pyBrowser = None
         pyMainUrl = CefToPyString(cefMainUrl)
         if pyBrowser:
             # Browser may be empty.
