Changeset 284789 in webkit

Timestamp:

Oct 25, 2021, 10:25:55 AM (5 years ago)

Author:

Darin Adler

Message:

Restore strict parsing behavior in parseStringArrayFromDictionaryToUInt16Vector
​https://bugs.webkit.org/show_bug.cgi?id=232218

Reviewed by Sam Weinig.

• platform/graphics/cocoa/HEVCUtilitiesCocoa.mm:

(WebCore::parseStringArrayFromDictionaryToUInt16Vector): Make sure the entire parse
fails if any of the elements in the array are either not strings, or do not parse
successfully as a uint16_t.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/cocoa/HEVCUtilitiesCocoa.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-10-25  Darin Adler  <darin@apple.com>
+
+        Restore strict parsing behavior in parseStringArrayFromDictionaryToUInt16Vector
+        https://bugs.webkit.org/show_bug.cgi?id=232218
+
+        Reviewed by Sam Weinig.
+
+        * platform/graphics/cocoa/HEVCUtilitiesCocoa.mm:
+        (WebCore::parseStringArrayFromDictionaryToUInt16Vector): Make sure the entire parse
+        fails if any of the elements in the array are either not strings, or do not parse
+        successfully as a uint16_t.
+
 2021-10-25  Alan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/platform/graphics/cocoa/HEVCUtilitiesCocoa.mm

@@ -142 +142 @@
     if (!array)
         return std::nullopt;
-    return makeVector(bridge_cast(array), [] (id value) {
-        return parseInteger<uint16_t>(String(dynamic_objc_cast<NSString>(value)));
+    bool parseFailed = false;
+    auto result = makeVector(bridge_cast(array), [&] (id value) {
+        auto parseResult = parseInteger<uint16_t>(String(dynamic_objc_cast<NSString>(value)));
+        parseFailed |= !parseResult;
+        return parseResult;
     });
+    if (parseFailed)
+        return std::nullopt;
+    return result;
 }