adium/adium

Fix some analyzer issues.
adium-1.6
2013-05-30, Frank Dowsett
868232f2e8ef
Parents 541ecd4ba9a7
Children c3018a7b41debe91f6ac390b
Fix some analyzer issues.
3 files changed, 4 insertions(+), 3 deletions(-)
  • +2 -2
    Frameworks/AIUtilities Framework/Source/AIStringAdditions.m
  • +1 -1
    Source/AIListLayoutWindowController.m
  • +1 -0
    Source/AIMessageViewEmoticonsController.m
    • --- a/Frameworks/AIUtilities Framework/Source/AIStringAdditions.m Thu May 30 12:59:34 2013 -0400
    +++ b/Frameworks/AIUtilities Framework/Source/AIStringAdditions.m Thu May 30 13:01:02 2013 -0400
    @@ -508,7 +508,7 @@
    #define SBEFS_BOUNDARY_GUARD \
    do { \
    if (i == buflen) { \
    - buf = realloc(buf, sizeof(unichar) * (buflen += buflenIncrement)); \
    + buf = reallocf(buf, sizeof(unichar) * (buflen += buflenIncrement)); \
    if (buf == NULL) { \
    NSLog(@"in stringByEscapingForShell: could not allocate %lu bytes", (unsigned long)(sizeof(unichar) * buflen)); \
    free(myBuf); \
    @@ -591,7 +591,7 @@
    #define SBEFR_BOUNDARY_GUARD \
    do { \
    if (i == buflen) { \
    -buf = realloc(buf, sizeof(unichar) * (buflen += buflenIncrement)); \
    +buf = reallocf(buf, sizeof(unichar) * (buflen += buflenIncrement)); \
    if (!buf) { \
    NSLog(@"in stringByEscapingForRegexp: could not allocate %lu bytes", (unsigned long)(sizeof(unichar) * buflen)); \
    free(myBuf); \
    --- a/Source/AIListLayoutWindowController.m Thu May 30 12:59:34 2013 -0400
    +++ b/Source/AIListLayoutWindowController.m Thu May 30 13:01:02 2013 -0400
    @@ -492,7 +492,7 @@
    - (void)updateUserIconMenuFromPrefDict:(NSDictionary *)prefDict
    {
    - NSInteger userIconPositionChoices[3];
    + NSInteger userIconPositionChoices[3] = {-1};
    if ([[adium.preferenceController preferenceForKey:KEY_LIST_LAYOUT_WINDOW_STYLE group:PREF_GROUP_APPEARANCE] integerValue] != AIContactListWindowStyleContactBubbles_Fitted) {
    userIconPositionChoices[0] = LIST_POSITION_LEFT;
    --- a/Source/AIMessageViewEmoticonsController.m Thu May 30 12:59:34 2013 -0400
    +++ b/Source/AIMessageViewEmoticonsController.m Thu May 30 13:01:02 2013 -0400
    @@ -50,6 +50,7 @@
    */
    - (id)initWithNibName:(NSString *)nibName textView:(AIMessageEntryTextView *)aView atPoint:(NSPoint)aPoint
    {
    + self = [super init];
    if ([[NSBundle mainBundle] loadNibFile:nibName
    externalNameTable:[NSDictionary dictionaryWithObjectsAndKeys:self, NSNibOwner, AI_topLevelObjects, NSNibTopLevelObjects, nil]
    withZone:nil]) {