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

Fixed NSURLComponents setURL: throwing exceptions.

Browse source 
This happened when setting an URL that didn't have all the different parts like fragment or query, as rangeOfString: throws for nil values.
This commit is contained in:
Frederik Seiffert 2020-03-10 17:58:08 +01:00
parent 1de4c85f43
commit 1e51ef1b1e
2 changed files with 26 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2020-03-10 Frederik Seiffert <frederik@algoriddim.com>
* Source/NSURL.m: fix –[NSURLComponents setURL:] throwing
exception for URLs that don't have all parts.
2020-03-01 Fred Kiefer <fredkiefer@gmx.de>
* Tests/base/NSBundle/TestInfo,

29
Source/NSURL.m
View file

@ -2236,6 +2236,15 @@ static NSUInteger urlAlign;
if (self != nil)
{
GS_CREATE_INTERNAL(NSURLComponents);
internal->_rangeOfFragment = NSMakeRange(NSNotFound, 0);
internal->_rangeOfHost = NSMakeRange(NSNotFound, 0);
internal->_rangeOfPassword = NSMakeRange(NSNotFound, 0);
internal->_rangeOfPath = NSMakeRange(NSNotFound, 0);
internal->_rangeOfPort = NSMakeRange(NSNotFound, 0);
internal->_rangeOfQuery = NSMakeRange(NSNotFound, 0);
internal->_rangeOfScheme = NSMakeRange(NSNotFound, 0);
internal->_rangeOfUser = NSMakeRange(NSNotFound, 0);
}
return self;
}
@ -2352,14 +2361,18 @@ static NSUInteger urlAlign;
[NSCharacterSet URLUserAllowedCharacterSet]]];
// Find ranges
internal->_rangeOfFragment = [[url absoluteString] rangeOfString: internal->_fragment];
internal->_rangeOfHost = [[url absoluteString] rangeOfString: internal->_host];
internal->_rangeOfPassword = [[url absoluteString] rangeOfString: internal->_password];
internal->_rangeOfPath = [[url absoluteString] rangeOfString: internal->_path];
internal->_rangeOfPort = [[url absoluteString] rangeOfString: [internal->_port stringValue]];
internal->_rangeOfQuery = [[url absoluteString] rangeOfString: internal->_query];
internal->_rangeOfScheme = [[url absoluteString] rangeOfString: internal->_scheme];
internal->_rangeOfUser = [[url absoluteString] rangeOfString: internal->_user];
NSString *urlString = [url absoluteString];
#define URL_COMPONENT_RANGE(part) \
(part ? [urlString rangeOfString:part] : NSMakeRange(NSNotFound, 0))
internal->_rangeOfFragment = URL_COMPONENT_RANGE(internal->_fragment);
internal->_rangeOfHost = URL_COMPONENT_RANGE(internal->_host);
internal->_rangeOfPassword = URL_COMPONENT_RANGE(internal->_password);
internal->_rangeOfPath = URL_COMPONENT_RANGE(internal->_path);
internal->_rangeOfPort = URL_COMPONENT_RANGE([internal->_port stringValue]);
internal->_rangeOfQuery = URL_COMPONENT_RANGE(internal->_query);
internal->_rangeOfScheme = URL_COMPONENT_RANGE(internal->_scheme);
internal->_rangeOfUser = URL_COMPONENT_RANGE(internal->_user);
#undef URL_COMPONENT_RANGE
}
- (NSURL *)URLRelativeToURL: (NSURL *)baseURL