Skip to content

Commit 934937e

Browse files
committed
Fixed releasing of shared request context. It was causing segmentation
fault during Shutdown.
1 parent 3c37e50 commit 934937e

3 files changed

Lines changed: 5 additions & 4 deletions

File tree

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
cef3-trunk
22
svn-win32-1.8.5
3-
cefpython.wiki
3+
cefpython.wiki
4+
.tags*

‎cefpython/browser.pyx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ IF CEF_VERSION == 3:
9797
if g_sharedRequestContext.get():
9898
# A similar release is done in Shutdown and CloseBrowser.
9999
Debug("RemovePyBrowser: releasing shared request context")
100-
g_sharedRequestContext.get().Release()
100+
g_sharedRequestContext.Assign(NULL)
101101
Debug("del g_pyBrowsers[%s]" % browserId)
102102
del g_pyBrowsers[browserId]
103103
else:
@@ -315,7 +315,7 @@ cdef class PyBrowser:
315315
# A similar release is done in Shutdown
316316
# and RemovePyBrowser.
317317
Debug("CloseBrowser: releasing shared request context")
318-
g_sharedRequestContext.get().Release()
318+
g_sharedRequestContext.Assign(NULL)
319319
Debug("CefBrowser::CloseBrowser(%s)" % forceClose)
320320
self.GetCefBrowserHost().get().CloseBrowser(bool(forceClose))
321321

‎cefpython/cefpython.pyx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,7 @@ def Shutdown():
385385
# A similar release is done in RemovePyBrowser and CloseBrowser.
386386
# This one is probably redundant. Additional testing should be done.
387387
Debug("Shutdown: releasing shared request context")
388-
g_sharedRequestContext.get().Release()
388+
g_sharedRequestContext.Assign(NULL)
389389
Debug("Shutdown()")
390390
with nogil:
391391
CefShutdown()

0 commit comments

Comments
 (0)