projects
/
webkit2gtk.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0d32c6e
)
Check for NULL pointer in FrameProgressTracker
author
Jeffrey Pfau
<jpfau@apple.com>
Fri, 6 Mar 2015 07:33:11 +0000
(07:33 +0000)
committer
Alberto Garcia
<berto@igalia.com>
Fri, 6 Mar 2015 07:33:11 +0000
(07:33 +0000)
===================================================================
Gbp-Pq: Name nullptr-frameprogresstracker.patch
Source/WebCore/loader/FrameLoader.cpp
patch
|
blob
|
history
diff --git
a/Source/WebCore/loader/FrameLoader.cpp
b/Source/WebCore/loader/FrameLoader.cpp
index cd716d957e20efdb1784b95dd51f0d05315a98eb..aa47372d99ff7111ff38c6fe4918ca342924b88b 100644
(file)
--- a/
Source/WebCore/loader/FrameLoader.cpp
+++ b/
Source/WebCore/loader/FrameLoader.cpp
@@
-189,8
+189,7
@@
public:
~FrameProgressTracker()
{
- ASSERT(!m_inProgress || m_frame.page());
- if (m_inProgress)
+ if (m_inProgress && m_frame.page())
m_frame.page()->progress().progressCompleted(m_frame);
}