Title: [148777] trunk/Source/WebCore
- Revision
- 148777
- Author
- [email protected]
- Date
- 2013-04-19 15:47:59 -0700 (Fri, 19 Apr 2013)
Log Message
Add a missing null pointer check after r148759.
* rendering/RenderObject.cpp:
(WebCore::RenderObject::containingBlock):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (148776 => 148777)
--- trunk/Source/WebCore/ChangeLog 2013-04-19 22:38:11 UTC (rev 148776)
+++ trunk/Source/WebCore/ChangeLog 2013-04-19 22:47:59 UTC (rev 148777)
@@ -1,3 +1,10 @@
+2013-04-19 Ryosuke Niwa <[email protected]>
+
+ Add a missing null pointer check after r148759.
+
+ * rendering/RenderObject.cpp:
+ (WebCore::RenderObject::containingBlock):
+
2013-04-19 Benjamin Poulain <[email protected]>
Use Vector instead of StringBuilder for CSSPreloadScanner's buffers
Modified: trunk/Source/WebCore/rendering/RenderObject.cpp (148776 => 148777)
--- trunk/Source/WebCore/rendering/RenderObject.cpp 2013-04-19 22:38:11 UTC (rev 148776)
+++ trunk/Source/WebCore/rendering/RenderObject.cpp 2013-04-19 22:47:59 UTC (rev 148777)
@@ -801,7 +801,7 @@
// not the inline itself, to avoid having a positioned objects list in all RenderInlines
// and use RenderBlock* as this function's return type.
// Use RenderBlock::container() to obtain the inline.
- if (o->isRenderInline())
+ if (o && o->isRenderInline())
o = o->containingBlock();
while (o && o->isAnonymousBlock())
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
