@@ -1405,24 +1405,24 @@ static void computeSanitizedString(CFURLRef url) {
1405
1405
if (!scanCharacters (alloc , & sanitizedString , & (((struct __CFURL * )url )-> _flags ), cstring , ustring , useCString , base , string_length , & mark , 0 , url -> _encoding )) {
1406
1406
((struct __CFURL * )url )-> _flags |= ORIGINAL_AND_URL_STRINGS_MATCH ;
1407
1407
}
1408
- if ( sanitizedString )
1409
- _setSanitizedString ( (struct __CFURL * ) url , sanitizedString );
1408
+ if ( sanitizedString ) {
1409
+ _setSanitizedString ( (struct __CFURL * ) url , sanitizedString );
1410
+ }
1410
1411
} else {
1411
1412
// Go component by component
1412
1413
CFIndex currentComponent = HAS_USER ;
1413
1414
mark = 0 ;
1415
+ CFMutableStringRef sanitizedString = NULL ;
1414
1416
while (currentComponent < (HAS_FRAGMENT << 1 )) {
1415
1417
CFRange componentRange = _rangeForComponent (url -> _flags , url -> ranges , currentComponent );
1416
1418
if (componentRange .location != kCFNotFound ) {
1417
- CFMutableStringRef sanitizedString = NULL ;
1418
1419
scanCharacters (alloc , & sanitizedString , & (((struct __CFURL * )url )-> _flags ), cstring , ustring , useCString , componentRange .location , componentRange .location + componentRange .length , & mark , currentComponent , url -> _encoding );
1419
-
1420
- if ( sanitizedString )
1421
- _setSanitizedString ( (struct __CFURL * ) url , sanitizedString );
1422
1420
}
1423
1421
currentComponent = currentComponent << 1 ;
1424
1422
}
1425
- if (!_getSanitizedString (url )) {
1423
+ if (sanitizedString ) {
1424
+ _setSanitizedString ((struct __CFURL * )url , sanitizedString );
1425
+ } else {
1426
1426
((struct __CFURL * )url )-> _flags |= ORIGINAL_AND_URL_STRINGS_MATCH ;
1427
1427
}
1428
1428
}
0 commit comments