gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-22 16:33:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

In -[GSMimeParser scanToken:] return @"" instead of nil when parsing an empty

Browse source 
quoted string.



git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@33952 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Niels Grewe 2011-10-08 17:53:17 +00:00
parent 364fb1ec98
commit 857d32b33d
2 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2011-10-08 Niels Grewe <niels.grewe@halbordnung.de>
* Source/Additions/GSMime.m (GSMimeParser -scanToken:): Return an empty
string instead of nil when parsing an empty quoted string.
2011-10-08 Richard Frith-Macdonald <rfm@gnu.org>
* GSFileHandle.m:

22
Source/Additions/GSMime.m
View file

@ -237,7 +237,7 @@ encodeQuotedPrintable(NSMutableData *result,
offset = [result length];
[result setLength: offset + size];
dst = (unsigned char*)[result mutableBytes];
column = 0;
column = 0;
for (i = 0; i < length; i++)
{
@ -1272,7 +1272,7 @@ wordData(NSString *word)
}
/*
* Correct size of output buffer.
*/
*/
[dData setLength: size + dst - beg];
}
else
@ -1518,7 +1518,7 @@ wordData(NSString *word)
}
if (l == 0)
{
/* Add an empty line to the end of the current headers to force
/* Add an empty line to the end of the current headers to force
* completion of header parsing.
*/
[self parseHeaders: [NSData dataWithBytes: "\r\n\r\n" length: 4]
@ -1542,7 +1542,7 @@ wordData(NSString *word)
else
{
NSUInteger i = NSMaxRange(r);
i -= [data length]; // Bytes to append to headers
[data appendBytes: [d bytes] length: i];
bytes = (unsigned char*)[data bytes];
@ -1805,7 +1805,7 @@ wordData(NSString *word)
return NO;
}
subtype = [info objectForKey: @"Subtype"];
if ([type isEqualToString: @"text"] == YES)
{
if (subtype == nil)
@ -2229,7 +2229,7 @@ NSDebugMLLog(@"GSMime", @"Header parsed - %@", info);
length = r.location - start;
if (length == 0)
{
return nil;
return @"";
}
else
{
@ -2663,7 +2663,7 @@ NSDebugMLLog(@"GSMime", @"Header parsed - %@", info);
else if (child == nil)
{
NSString *cset;
/*
* Found boundary at the start of the first section.
* Set sectionStart to point immediately after boundary.
@ -4048,7 +4048,7 @@ appendString(NSMutableData *m, NSUInteger offset, NSUInteger fold,
}
/*
* Now look for the xml encoding declaration ...
* Now look for the xml encoding declaration ...
*/
// Tolerate leading whitespace
@ -4348,7 +4348,7 @@ appendString(NSMutableData *m, NSUInteger offset, NSUInteger fold,
+ (NSStringEncoding) encodingFromCharset: (NSString*)charset
{
NSStringEncoding enc = NSASCIIStringEncoding;
if (charset != nil)
{
enc = (NSStringEncoding)NSMapGet(charsets, charset);
@ -5193,7 +5193,7 @@ appendString(NSMutableData *m, NSUInteger offset, NSUInteger fold,
}
/**
* Converts any base64 encoded parts of the receiver's content to be
* Converts any base64 encoded parts of the receiver's content to be
* binary encoded instead ... a convenience method to
* shrink down the size of the message when converted to data using
* the -rawMimeData method.
@ -6674,7 +6674,7 @@ GS_PRIVATE_INTERNAL(GSMimeSMTPClient)
return @"idle ... not connected to SMTP server";
}
/** Handler for stream events ...
/** Handler for stream events ...
*/
- (void) stream: (NSStream*)aStream handleEvent: (NSStreamEvent)anEvent
{