gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-23 09:04:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

poatches by Marcus and Stefan

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@35906 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rfm 2012-12-18 09:00:40 +00:00
parent 9923323d24
commit cd97eb99b3
3 changed files with 19 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2012-12-18 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSNetServices.m: patch by Marcus Muller to correctly check
that either the input or the output stream has been opened.
* Source/GSString.m: patch by Stefan Bidi to optimise utf-8 to
utf-16 conversion a little.
2012-12-12 Richard Frith-Macdonald <rfm@gnu.org>
* Source/GSMime.m: Fix parsing of final boundary in a multipart

23
Source/GSString.m
View file

@ -182,6 +182,15 @@ lengthUTF8(const uint8_t *p, unsigned l, BOOL *ascii, BOOL *latin1)
return l;
}
/* Count the number of bytes that make up this UTF-8 code point.
This to keep in mind:
* This macro doesn't return anything larger than '4'
* Legal UTF-8 cannot be larger than 4 bytes long (0x10FFFF)
* It will return 0 for anything illegal
*/
#define UTF8_BYTE_COUNT(c) \
(((c) < 0xf8) ? 1 + ((c) >= 0xc0) + ((c) >= 0xe0) + ((c) >= 0xf0) : 0)
/* Sequentially extracts characters from UTF-8 string
* p = pointer to the utf-8 data
* l = length (bytes) of the utf-8 data
@ -216,14 +225,10 @@ nextUTF8(const uint8_t *p, unsigned l, unsigned *o, unichar *n)
int j, sle = 0;
/* calculated the expected sequence length */
while (c & 0x80)
{
c = c << 1;
sle++;
}
sle = UTF8_BYTE_COUNT(c);
/* legal ? */
if ((sle < 2) || (sle > 6))
if (sle < 2)
{
[NSException raise: NSInvalidArgumentException
format: @"bad multibyte character length"];
@ -262,12 +267,6 @@ nextUTF8(const uint8_t *p, unsigned l, unsigned *o, unichar *n)
[NSException raise: NSInvalidArgumentException
format: @"invalid unicode codepoint"];
}
if ((u >= 0xd800) && (u <= 0xdfff))
{
[NSException raise: NSInvalidArgumentException
format: @"unmatched half of surrogate pair"];
}
}
else
{

2
Source/NSNetServices.m
View file

@ -281,7 +281,7 @@ static Class concreteBrowserClass;
inputStream: inputStream
outputStream: outputStream];
return inputStream && outputStream;
return inputStream || outputStream;
}
/*