From 6e5dee13e1d99fe38656faf6cc68d666bc9cd59c Mon Sep 17 00:00:00 2001 From: Alexandre Wilhelm Date: Mon, 9 Feb 2015 16:44:59 -0800 Subject: [PATCH 1/2] Fixed: The CPDatePicker can take invalid date Previously, the CPDatePicker could get an invalid javascript date. Now it will raise an exception when getting an invalidate date. --- AppKit/CPDatePicker/CPDatePicker.j | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/AppKit/CPDatePicker/CPDatePicker.j b/AppKit/CPDatePicker/CPDatePicker.j index 80b7c9efe..7f4096552 100644 --- a/AppKit/CPDatePicker/CPDatePicker.j +++ b/AppKit/CPDatePicker/CPDatePicker.j @@ -323,6 +323,15 @@ CPEraDatePickerElementFlag = 0x0100; */ - (void)_setDateValue:(CPDate)aDateValue timeInterval:(CPTimeInterval)aTimeInterval { + // Make sure to have a valid date and avoid NaN values + if (!isFinite(aDateValue)) + { + [CPException raise:CPInvalidArgumentException + reason:@"aDateValue is not valid"]; + return; + } + + if (_minDate) aDateValue = new Date (MAX(aDateValue, _minDate)); From 818c3b609269a5cd72fd6c224bff6a1e20e8af56 Mon Sep 17 00:00:00 2001 From: Alexandre Wilhelm Date: Mon, 9 Feb 2015 16:46:08 -0800 Subject: [PATCH 2/2] Typo in CPDatePicker --- AppKit/CPDatePicker/CPDatePicker.j | 1 - 1 file changed, 1 deletion(-) diff --git a/AppKit/CPDatePicker/CPDatePicker.j b/AppKit/CPDatePicker/CPDatePicker.j index 7f4096552..e4f92138a 100644 --- a/AppKit/CPDatePicker/CPDatePicker.j +++ b/AppKit/CPDatePicker/CPDatePicker.j @@ -331,7 +331,6 @@ CPEraDatePickerElementFlag = 0x0100; return; } - if (_minDate) aDateValue = new Date (MAX(aDateValue, _minDate));