Changeset 176474 in webkit

Timestamp:

Nov 21, 2014, 3:10:59 PM (12 years ago)

Author:

timothy_horton@apple.com

Message:

Crashes while encoding a TextIndicator with no contentImageWithHighlight
​https://bugs.webkit.org/show_bug.cgi?id=138984
<rdar://problem/19063717>

Reviewed by Sam Weinig.

• Shared/WebCoreArgumentCoders.cpp:

(IPC::ArgumentCoder<TextIndicatorData>::encode):
(IPC::ArgumentCoder<TextIndicatorData>::decode):
encodeImage doesn't deal with null images, so handle that case gracefully.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/WebCoreArgumentCoders.cpp (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-11-21  Tim Horton  <timothy_horton@apple.com>
+
+        Crashes while encoding a TextIndicator with no contentImageWithHighlight
+        https://bugs.webkit.org/show_bug.cgi?id=138984
+        <rdar://problem/19063717>
+
+        Reviewed by Sam Weinig.
+
+        * Shared/WebCoreArgumentCoders.cpp:
+        (IPC::ArgumentCoder<TextIndicatorData>::encode):
+        (IPC::ArgumentCoder<TextIndicatorData>::decode):
+        encodeImage doesn't deal with null images, so handle that case gracefully.
+
 2014-11-21  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp

@@ -1969 +1969 @@
     encoder << textIndicatorData.contentImageScaleFactor;
     encoder.encodeEnum(textIndicatorData.presentationTransition);
-    encodeImage(encoder, textIndicatorData.contentImage.get());
-    encodeImage(encoder, textIndicatorData.contentImageWithHighlight.get());
+
+    bool hasImage = textIndicatorData.contentImage;
+    encoder << hasImage;
+    if (hasImage)
+        encodeImage(encoder, textIndicatorData.contentImage.get());
+
+    bool hasImageWithHighlight = textIndicatorData.contentImageWithHighlight;
+    encoder << hasImageWithHighlight;
+    if (hasImageWithHighlight)
+        encodeImage(encoder, textIndicatorData.contentImageWithHighlight.get());
 }
 
@@ -1990 +1998 @@
         return false;
 
-    if (!decodeImage(decoder, textIndicatorData.contentImage))
-        return false;
-
-    if (!decodeImage(decoder, textIndicatorData.contentImageWithHighlight))
+    bool hasImage;
+    if (!decoder.decode(hasImage))
+        return false;
+    if (hasImage && !decodeImage(decoder, textIndicatorData.contentImage))
+        return false;
+
+    bool hasImageWithHighlight;
+    if (!decoder.decode(hasImageWithHighlight))
+        return false;
+    if (hasImageWithHighlight && !decodeImage(decoder, textIndicatorData.contentImageWithHighlight))
         return false;