Revision: 28461 http://sourceforge.net/p/bibdesk/svn/28461 Author: hofman Date: 2023-11-26 09:52:43 +0000 (Sun, 26 Nov 2023) Log Message: ----------- check for empty month string early
Modified Paths: -------------- trunk/bibdesk/NSDate_BDSKExtensions.m Modified: trunk/bibdesk/NSDate_BDSKExtensions.m =================================================================== --- trunk/bibdesk/NSDate_BDSKExtensions.m 2023-11-26 09:26:04 UTC (rev 28460) +++ trunk/bibdesk/NSDate_BDSKExtensions.m 2023-11-26 09:52:43 UTC (rev 28461) @@ -87,7 +87,9 @@ } if (node == nil) monthString = [(BDSKStringNode *)[nodes objectAtIndex:0] value]; - } else if ([NSString isEmptyString:monthString] == NO) { + } else if ([NSString isEmptyString:monthString]) { + return NO; + } else { NSRange r = [monthString rangeOfCharacterFromSet:[NSCharacterSet letterCharacterSet]]; NSUInteger start = 0, end = [monthString length]; if (r.location != NSNotFound) { @@ -104,13 +106,13 @@ end = r.location; } } - if (start > 0 || end < [monthString length]) + if ((start > 0 || end < [monthString length]) && start < end) monthString = [monthString substringWithRange:NSMakeRange(start, end - start)]; } NSInteger month = 0; - if ([NSString isEmptyString:monthString]) + if ([monthString length] == 0) { return 0; - if ([monthString length] < 3 && [[NSCharacterSet decimalDigitCharacterSet] characterIsMember:[monthString characterAtIndex:0]]) { + } else if ([monthString length] < 3 && [[NSCharacterSet decimalDigitCharacterSet] characterIsMember:[monthString characterAtIndex:0]]) { month = [monthString integerValue]; } else { monthString = [monthString lowercaseString]; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. _______________________________________________ Bibdesk-commit mailing list Bibdesk-commit@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/bibdesk-commit