mirror of
https://github.com/gnustep/libs-base.git
synced 2025-05-30 16:30:41 +00:00
tweak length check in last change to ignore line breaks and bad characters
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@34129 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
014c5ebc66
commit
cd0d3a62e5
1 changed files with 4 additions and 3 deletions
|
@ -4152,7 +4152,7 @@ appendString(NSMutableData *m, NSUInteger offset, NSUInteger fold,
|
||||||
+ (NSData*) decodeBase64: (NSData*)source
|
+ (NSData*) decodeBase64: (NSData*)source
|
||||||
{
|
{
|
||||||
int length;
|
int length;
|
||||||
int declen ;
|
int declen;
|
||||||
const unsigned char *src;
|
const unsigned char *src;
|
||||||
const unsigned char *end;
|
const unsigned char *end;
|
||||||
unsigned char *result;
|
unsigned char *result;
|
||||||
|
@ -4220,7 +4220,8 @@ appendString(NSMutableData *m, NSUInteger offset, NSUInteger fold,
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
c = -1; /* Ignore ... non-standard but more tolerant */
|
c = -1; /* Ignore ... non-standard but more tolerant. */
|
||||||
|
length--; /* Don't count this as part of the length. */
|
||||||
}
|
}
|
||||||
|
|
||||||
if (c >= 0)
|
if (c >= 0)
|
||||||
|
@ -4235,7 +4236,7 @@ appendString(NSMutableData *m, NSUInteger offset, NSUInteger fold,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* If length is not a multiple of four, treat it as if the missing
|
/* If number of bytes is not a multiple of four, treat it as if the missing
|
||||||
* bytes were the '=' characters normally used for padding.
|
* bytes were the '=' characters normally used for padding.
|
||||||
* This is not allowed by the basic standards, but permitted in some
|
* This is not allowed by the basic standards, but permitted in some
|
||||||
* variants of 6ase64 encoding, so we should tolerate it.
|
* variants of 6ase64 encoding, so we should tolerate it.
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue