Title: [258614] trunk/Source/WebCore
Revision
258614
Author
[email protected]
Date
2020-03-17 17:29:42 -0700 (Tue, 17 Mar 2020)

Log Message

SerializedScriptValue::decode should check bufferIsLargeEnoughToContain before allocating a buffer
https://bugs.webkit.org/show_bug.cgi?id=209132

Reviewed by Darin Adler.

* bindings/js/SerializedScriptValue.h:
(WebCore::SerializedScriptValue::decode): Added bufferIsLargeEnoughToContain check.
Added a null check for Gigacage::tryMalloc.

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (258613 => 258614)


--- trunk/Source/WebCore/ChangeLog	2020-03-18 00:12:47 UTC (rev 258613)
+++ trunk/Source/WebCore/ChangeLog	2020-03-18 00:29:42 UTC (rev 258614)
@@ -1,3 +1,14 @@
+2020-03-17  Fujii Hironori  <[email protected]>
+
+        SerializedScriptValue::decode should check bufferIsLargeEnoughToContain before allocating a buffer
+        https://bugs.webkit.org/show_bug.cgi?id=209132
+
+        Reviewed by Darin Adler.
+
+        * bindings/js/SerializedScriptValue.h:
+        (WebCore::SerializedScriptValue::decode): Added bufferIsLargeEnoughToContain check.
+        Added a null check for Gigacage::tryMalloc.
+
 2020-03-17  Chris Fleizach  <[email protected]>
 
         AX: WebKit crashes with VO and keyboard support fails on encapsulated radio button components.

Modified: trunk/Source/WebCore/bindings/js/SerializedScriptValue.h (258613 => 258614)


--- trunk/Source/WebCore/bindings/js/SerializedScriptValue.h	2020-03-18 00:12:47 UTC (rev 258613)
+++ trunk/Source/WebCore/bindings/js/SerializedScriptValue.h	2020-03-18 00:29:42 UTC (rev 258614)
@@ -179,8 +179,12 @@
         unsigned bufferSize;
         if (!decoder.decode(bufferSize))
             return nullptr;
+        if (!decoder.template bufferIsLargeEnoughToContain<uint8_t>(bufferSize))
+            return nullptr;
 
         auto buffer = Gigacage::tryMalloc(Gigacage::Primitive, bufferSize);
+        if (!buffer)
+            return nullptr;
         if (!decoder.decodeFixedLengthData(static_cast<uint8_t*>(buffer), bufferSize, 1)) {
             Gigacage::free(Gigacage::Primitive, buffer);
             return nullptr;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to