From ae3b31546856d67d718dc5bb20e84960299ca5af Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Tue, 5 Apr 2011 00:43:57 +0000 Subject: [PATCH] Monotone-Parent: f84a8ee34fde286386429490ca9126042402c390 Monotone-Revision: 222083e95ee04558a1c46c2bcf14f8fb5ccebb98 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2011-04-05T00:43:57 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 7 +++++++ UI/Scheduler/UIxCalListingActions.m | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 33829da00..1f0887e46 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2011-04-04 Wolfgang Sourdeau + + * UI/Scheduler/UIxCalListingActions.m + (-_fillBlocks:withEvent:withNumber:): fixed type confusion between + char * and NSString * that could cause a crash under certain + circumstances. + 2011-04-01 Wolfgang Sourdeau * Tests/Unit/TestSBJsonParser.m (-test_parseJSONString): input and diff --git a/UI/Scheduler/UIxCalListingActions.m b/UI/Scheduler/UIxCalListingActions.m index 63ca20c42..cbe79cf3b 100644 --- a/UI/Scheduler/UIxCalListingActions.m +++ b/UI/Scheduler/UIxCalListingActions.m @@ -702,7 +702,7 @@ _userStateInEvent (NSArray *event) offset = ((currentStart - startSecs) / dayLength); if (offset >= [blocks count]) - [self errorWithFormat: "event '%@' has a computed offset that" + [self errorWithFormat: @"event '%@' has a computed offset that" @" overflows the amount of blocks (skipped)", [event objectAtIndex: eventNameIndex]]; else