Title: [188156] branches/safari-601.1.46-branch/Source/WebKit2
- Revision
- 188156
- Author
- lforsch...@apple.com
- Date
- 2015-08-07 13:19:20 -0700 (Fri, 07 Aug 2015)
Log Message
Merged r188115. rdar://problem/22181735
Modified Paths
Diff
Modified: branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog (188155 => 188156)
--- branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog 2015-08-07 20:17:49 UTC (rev 188155)
+++ branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog 2015-08-07 20:19:20 UTC (rev 188156)
@@ -1,5 +1,23 @@
2015-08-07 Lucas Forschler <lforsch...@apple.com>
+ Merge r188115
+
+ 2015-08-06 Beth Dakin <bda...@apple.com>
+
+ TextIndicator can have stale contentImage data and crash
+ https://bugs.webkit.org/show_bug.cgi?id=147770
+ -and corresponding-
+ rdar://problem/22181735
+
+ Reviewed by Tim Horton.
+
+ If there is no contentImage or contentImageWithHighlight, set them to
+ nullptr.
+ * Shared/WebCoreArgumentCoders.cpp:
+ (IPC::ArgumentCoder<TextIndicatorData>::decode):
+
+2015-08-07 Lucas Forschler <lforsch...@apple.com>
+
Merge r188112
2015-08-06 Dan Bernstein <m...@apple.com>
Modified: branches/safari-601.1.46-branch/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp (188155 => 188156)
--- branches/safari-601.1.46-branch/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp 2015-08-07 20:17:49 UTC (rev 188155)
+++ branches/safari-601.1.46-branch/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp 2015-08-07 20:19:20 UTC (rev 188156)
@@ -2169,12 +2169,16 @@
bool hasImage;
if (!decoder.decode(hasImage))
return false;
+ if (!hasImage)
+ textIndicatorData.contentImage = nullptr;
if (hasImage && !decodeImage(decoder, textIndicatorData.contentImage))
return false;
bool hasImageWithHighlight;
if (!decoder.decode(hasImageWithHighlight))
return false;
+ if (!hasImageWithHighlight)
+ textIndicatorData.contentImageWithHighlight = nullptr;
if (hasImageWithHighlight && !decodeImage(decoder, textIndicatorData.contentImageWithHighlight))
return false;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
