Title: [269086] branches/safari-610-branch/Source/WebKit
Revision
269086
Author
[email protected]
Date
2020-10-27 18:42:49 -0700 (Tue, 27 Oct 2020)

Log Message

Cherry-pick r268537. rdar://problem/70733338

    Crash in -[WKDateTimePicker setDateTimePickerToInitialValue]
    https://bugs.webkit.org/show_bug.cgi?id=217763
    <rdar://problem/68635008>

    Reviewed by Wenson Hsieh.

    Crash occurs due to the use of an autoreleased NSString in
    setDateTimePickerToInitialValue. To fix, make the variable
    a RetainPtr.

    * UIProcess/ios/forms/WKDateTimeInputControl.mm:
    (-[WKDateTimePicker setDateTimePickerToInitialValue]):

    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@268537 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Modified Paths

Diff

Modified: branches/safari-610-branch/Source/WebKit/ChangeLog (269085 => 269086)


--- branches/safari-610-branch/Source/WebKit/ChangeLog	2020-10-28 01:42:45 UTC (rev 269085)
+++ branches/safari-610-branch/Source/WebKit/ChangeLog	2020-10-28 01:42:49 UTC (rev 269086)
@@ -1,3 +1,38 @@
+2020-10-27  Russell Epstein  <[email protected]>
+
+        Cherry-pick r268537. rdar://problem/70733338
+
+    Crash in -[WKDateTimePicker setDateTimePickerToInitialValue]
+    https://bugs.webkit.org/show_bug.cgi?id=217763
+    <rdar://problem/68635008>
+    
+    Reviewed by Wenson Hsieh.
+    
+    Crash occurs due to the use of an autoreleased NSString in
+    setDateTimePickerToInitialValue. To fix, make the variable
+    a RetainPtr.
+    
+    * UIProcess/ios/forms/WKDateTimeInputControl.mm:
+    (-[WKDateTimePicker setDateTimePickerToInitialValue]):
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@268537 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2020-10-15  Aditya Keerthi  <[email protected]>
+
+            Crash in -[WKDateTimePicker setDateTimePickerToInitialValue]
+            https://bugs.webkit.org/show_bug.cgi?id=217763
+            <rdar://problem/68635008>
+
+            Reviewed by Wenson Hsieh.
+
+            Crash occurs due to the use of an autoreleased NSString in
+            setDateTimePickerToInitialValue. To fix, make the variable
+            a RetainPtr.
+
+            * UIProcess/ios/forms/WKDateTimeInputControl.mm:
+            (-[WKDateTimePicker setDateTimePickerToInitialValue]):
+
 2020-10-21  Russell Epstein  <[email protected]>
 
         Cherry-pick r268570. rdar://problem/70541887

Modified: branches/safari-610-branch/Source/WebKit/UIProcess/ios/forms/WKDateTimeInputControl.mm (269085 => 269086)


--- branches/safari-610-branch/Source/WebKit/UIProcess/ios/forms/WKDateTimeInputControl.mm	2020-10-28 01:42:45 UTC (rev 269085)
+++ branches/safari-610-branch/Source/WebKit/UIProcess/ios/forms/WKDateTimeInputControl.mm	2020-10-28 01:42:49 UTC (rev 269086)
@@ -49,7 +49,7 @@
 > {
     RetainPtr<UIDatePicker> _datePicker;
     NSString *_formatString;
-    NSString *_initialValue;
+    RetainPtr<NSString> _initialValue;
     NSTimeInterval _initialValueAsNumber;
     BOOL _shouldRemoveTimeZoneInformation;
     BOOL _isTimeInput;
@@ -383,7 +383,7 @@
     } else if (_formatString) {
         // Convert the string value to a date object for the fields where we have a format string.
         RetainPtr<NSDateFormatter> dateFormatter = [self dateFormatterForPicker];
-        NSDate *parsedDate = [dateFormatter dateFromString:[self _sanitizeInputValueForFormatter:_initialValue]];
+        NSDate *parsedDate = [dateFormatter dateFromString:[self _sanitizeInputValueForFormatter:_initialValue.get()]];
         [_datePicker setDate:parsedDate ? parsedDate : [NSDate date]];
     } else {
         // Convert the number value to a date object for the fields affected by timezones.
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to