Changeset 3174

Timestamp:

03/25/06 16:20:12 (2 years ago)

Author:

timothy

Message:

Fixes a crash when the encoding does not accept specific input. We now fallback to ISO-Latin 1 like before. Fixes #551 and http://colloquy.info/admin/crash.html?id=902.

Files:

• trunk/Chat Core/MVIRCChatConnection.m (modified) (19 diffs)
• trunk/Chat Core/MVIRCFileTransfer.m (modified) (2 diffs)

trunk/Chat Core/MVIRCChatConnection.m

@@ -225 +225 @@
-        [_threadWaitLock unlockWithCondition:0];
-
-
+
+
-}
-
-- (void) disconnectWithReason:(NSAttributedString *) reason {
-        [self cancelPendingReconnectAttempts];
-
+
+
-
-        if( _status == MVChatConnectionConnectedStatus ) {
@@ -239 +241 @@
-        }
-
-
+
+
-}
-
@@ -363 +366 @@
-
-        if( now ) {
-
+
+
-
-                id old = _lastCommand;
@@ -375 +379 @@
-                }
-
-
+&& _connectionThread 
-                        [self performSelector:@selector( _startQueueTimer ) withObject:nil inThread:_connectionThread];
-        }
@@ -682 +686 @@
-- (void) socket:(AsyncSocket *) sock didReadData:(NSData *) data withTag:(long) tag {
-        NSString *rawString = [[NSString allocWithZone:nil] initWithData:data encoding:[self encoding]];
+        if( ! rawString ) rawString = [[NSString allocWithZone:nil] initWithData:data encoding:NSISOLatin1StringEncoding];
+
-        const char *line = (const char *)[data bytes];
-        unsigned int len = [data length];
@@ -758 +764 @@
-                                while( notEndOfLine() && *line != ' ' ) line++;
-                                param = [[NSString allocWithZone:nil] initWithBytes:currentParameter length:(line - currentParameter) encoding:[self encoding]];
+                                if( ! param ) param = [[NSString allocWithZone:nil] initWithBytes:currentParameter length:(line - currentParameter) encoding:NSISOLatin1StringEncoding];
-                                checkAndMarkIfDone();
-                                if( ! done ) line++;
@@ -777 +784 @@
-
-        if( command && commandLength ) {
-[self encoding]
+NSASCIIStringEncoding
-                NSString *selectorString = [[NSString allocWithZone:nil] initWithFormat:@"_handle%@WithParameters:fromSender:", [commandString capitalizedString]];
-                SEL selector = NSSelectorFromString( selectorString );
@@ -785 +792 @@
-                if( [self respondsToSelector:selector] ) {
-                        NSString *senderString = nil;
-
+
+
+
+
-
-                        MVChatUser *chatUser = nil;
-user && userLength ) {
+senderString && user && userLength ) { // if user is not null that shows it was a user not a server sender 
-                                chatUser = [self chatUserWithUniqueIdentifier:senderString];
-                                if( ! [chatUser address] && host && hostLength ) {
-                                        NSString *hostString = [[NSString allocWithZone:nil] initWithBytes:host length:hostLength encoding:[self encoding]];
+                                        if( ! hostString ) hostString = [[NSString allocWithZone:nil] initWithBytes:host length:hostLength encoding:NSISOLatin1StringEncoding];
-                                        [chatUser _setAddress:hostString];
-                                        [hostString release];
@@ -798 +809 @@
-                                if( ! [chatUser username] ) {
-                                        NSString *userString = [[NSString allocWithZone:nil] initWithBytes:user length:userLength encoding:[self encoding]];
+                                        if( ! userString ) userString = [[NSString allocWithZone:nil] initWithBytes:user length:userLength encoding:NSISOLatin1StringEncoding];
-                                        [chatUser _setUsername:userString];
-                                        [userString release];
@@ -1010 +1022 @@
-
-- (NSString *) _stringFromPossibleData:(id) input {
-
-
+
+
+
+
+
-        return input;
-}
@@ -1124 +1139 @@
-                                if( [[sender nickname] isEqualToString:@"NickServ"] ) {
-                                        NSString *msg = [[NSString allocWithZone:nil] initWithData:msgData encoding:[self encoding]];
+                                        if( ! msg ) msg = [[NSString allocWithZone:nil] initWithData:msgData encoding:NSISOLatin1StringEncoding];
-                                        if( [msg rangeOfString:@"NickServ"].location != NSNotFound && [msg rangeOfString:@"IDENTIFY"].location != NSNotFound ) {
-                                                if( ! [self nicknamePassword] ) {
@@ -1152 +1168 @@
-        while( line != end && *line != ' ' ) line++;
-        NSString *command = [[NSString allocWithZone:nil] initWithBytes:current length:(line - current) encoding:[self encoding]];
+        if( ! command ) command = [[NSString allocWithZone:nil] initWithBytes:current length:(line - current) encoding:NSISOLatin1StringEncoding];
+
-        NSMutableData *arguments = nil;
-        if( line != end ) arguments = [[NSMutableData allocWithZone:nil] initWithBytes:++line length:(end - line)];
@@ -1207 +1225 @@
-                } else if( [command caseInsensitiveCompare:@"DCC"] == NSOrderedSame ) {
-                        NSString *msg = [[NSString allocWithZone:nil] initWithData:arguments encoding:[self encoding]];
+                        if( ! msg ) msg = [[NSString allocWithZone:nil] initWithData:arguments encoding:NSISOLatin1StringEncoding];
-
-                        NSString *subCommand = nil;
@@ -1662 +1681 @@
-                if( room && ! [room _namesSynced] ) {
-                        NSAutoreleasePool *pool = [[NSAutoreleasePool allocWithZone:nil] init];
-[NSString allocWithZone:nil] initWithData:[parameters objectAtIndex:3] encoding:[self encoding
+self _stringFromPossibleData:[parameters objectAtIndex:3
-                        NSArray *members = [names componentsSeparatedByString:@" "];
-                        NSEnumerator *enumerator = [members objectEnumerator];
@@ -1691 +1710 @@
-                        }
-
-                        [names release];
-                        [pool drain];
-                        [pool release];
@@ -1802 +1820 @@
-                [user _setUsername:[parameters objectAtIndex:2]];
-                [user _setAddress:[parameters objectAtIndex:3]];
-
-
-
+
-        }
-}
@@ -1851 +1867 @@
-- (void) _handle319WithParameters:(NSArray *) parameters fromSender:(id) sender { // RPL_WHOISCHANNELS
-        if( [parameters count] == 3 ) {
-[NSString allocWithZone:nil] initWithData:[parameters objectAtIndex:2] encoding:[self encoding
+self _stringFromPossibleData:[parameters objectAtIndex:2
-                NSArray *chanArray = [[rooms stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]] componentsSeparatedByString:@" "];
-                NSMutableArray *results = [[NSMutableArray allocWithZone:nil] initWithCapacity:[chanArray count]];
@@ -1868 +1884 @@
-                }
-
-                [rooms release];
-                [results release];
-        }
@@ -1875 +1890 @@
-- (void) _handle320WithParameters:(NSArray *) parameters fromSender:(id) sender { // RPL_WHOISIDENTIFIED
-        if( [parameters count] == 3 ) {
-[NSString allocWithZone:nil] initWithData:[parameters objectAtIndex:2] encoding:[self encoding
+self _stringFromPossibleData:[parameters objectAtIndex:2
-                if( [comment rangeOfString:@"identified" options:NSCaseInsensitiveSearch].location != NSNotFound ) {
-                        MVChatUser *user = [self chatUserWithUniqueIdentifier:[parameters objectAtIndex:1]];
-                        [user _setIdentified:YES];
-                }
-                [comment release];
-        }
-}

trunk/Chat Core/MVIRCFileTransfer.m

@@ -273 +273 @@
-        [_threadWaitLock unlockWithCondition:0];
-
+        if( ! _connectionThread ) return;
+
-        if( ! [self isPassive] ) [self performSelector:@selector( _waitForConnection ) inThread:_connectionThread];
-        else [self performSelector:@selector( _connect ) inThread:_connectionThread];
@@ -528 +530 @@
-        [_threadWaitLock unlockWithCondition:0];
-
+        if( ! _connectionThread ) return;
+
-        if( ! [self isPassive] ) [self performSelector:@selector( _connect ) inThread:_connectionThread];
-        else [self performSelector:@selector( _waitForConnection ) inThread:_connectionThread];