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

make base64 decoding more tolerant.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@34128 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rfm 2011-11-07 08:15:00 +00:00
parent 26f7e4b33d
commit c28138f3fa
3 changed files with 35 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Source/Additions/GSMime.m
View file

@ -4201,22 +4201,26 @@ appendString(NSMutableData *m, NSUInteger offset, NSUInteger fold,
{
c = 63;
}
else if (c == '_')
{
c = 63; /* RFC 4648 permits '_' in URLs and filenames */
}
else if (c == '+')
{
c = 62;
}
else if (c == '-')
{
c = 62; /* RFC 4648 permits '-' in URLs and filenames */
}
else if (c == '=')
{
c = -1;
pad++;
}
else if (c == '-')
{
break; /* end */
}
else
{
c = -1; /* ignore */
c = -1; /* Ignore ... non-standard but more tolerant */
}
if (c >= 0)
@ -4231,6 +4235,15 @@ appendString(NSMutableData *m, NSUInteger offset, NSUInteger fold,
}
}
/* If length is not a multiple of four, treat it as if the missing
* bytes were the '=' characters normally used for padding.
* This is not allowed by the basic standards, but permitted in some
* variants of 6ase64 encoding, so we should tolerate it.
*/
if (length % 4 > 0)
{
pad += (4 - length % 4);
}
if (pos > 0)
{
NSUInteger i;