mirror of
https://github.com/gnustep/libs-base.git
synced 2025-04-22 16:33:29 +00:00
Add a couple of tests for errors.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@24186 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
aa920a0395
commit
c51ffc03af
3 changed files with 32 additions and 15 deletions
|
@ -1,3 +1,9 @@
|
|||
2006-12-05 Richard Frith-Macdonald <rfm@gnu.org>
|
||||
|
||||
* NSURL.m: Check for missing scheme and return nil.
|
||||
* NSString.m: Check for character conversion failure when
|
||||
getting a CString.
|
||||
|
||||
2006-11-30 Richard Frith-Macdonald <rfm@gnu.org>
|
||||
|
||||
* Source/GSHTTPURLHandle.m: Limit size of handle cache to 16 to
|
||||
|
|
|
@ -2564,7 +2564,15 @@ handle_printf_atsign (FILE *stream,
|
|||
unsigned length = [d length];
|
||||
BOOL result = (length <= maxLength) ? YES : NO;
|
||||
|
||||
if (length > maxLength) length = maxLength;
|
||||
if (d == nil)
|
||||
{
|
||||
[NSException raise: NSCharacterConversionException
|
||||
format: @"Can't convert to C string."];
|
||||
}
|
||||
if (length > maxLength)
|
||||
{
|
||||
length = maxLength;
|
||||
}
|
||||
memcpy(buffer, [d bytes], length);
|
||||
buffer[length] = '\0';
|
||||
return result;
|
||||
|
|
|
@ -700,21 +700,24 @@ static unsigned urlAlign;
|
|||
/*
|
||||
* Set up scheme specific parsing options.
|
||||
*/
|
||||
if (buf->scheme != 0)
|
||||
if (buf->scheme == 0)
|
||||
{
|
||||
DESTROY(self); // Not a valid URL
|
||||
NS_VALRETURN(nil);
|
||||
}
|
||||
|
||||
if (strcmp(buf->scheme, "file") == 0)
|
||||
{
|
||||
if (strcmp(buf->scheme, "file") == 0)
|
||||
{
|
||||
usesFragments = NO;
|
||||
usesParameters = NO;
|
||||
usesQueries = NO;
|
||||
buf->isFile = YES;
|
||||
}
|
||||
else if (strcmp(buf->scheme, "mailto") == 0)
|
||||
{
|
||||
usesFragments = NO;
|
||||
usesParameters = NO;
|
||||
usesQueries = NO;
|
||||
}
|
||||
usesFragments = NO;
|
||||
usesParameters = NO;
|
||||
usesQueries = NO;
|
||||
buf->isFile = YES;
|
||||
}
|
||||
else if (strcmp(buf->scheme, "mailto") == 0)
|
||||
{
|
||||
usesFragments = NO;
|
||||
usesParameters = NO;
|
||||
usesQueries = NO;
|
||||
}
|
||||
|
||||
if (canBeGeneric == YES)
|
||||
|
|
Loading…
Reference in a new issue