Merge pull request #2899 from valeriyvan/leak_CFURL

swift-ci · web-flow · commit 3cf6ce3964cc · 2021-06-09T03:09:02.000-07:00
diff --git a/CoreFoundation/URL.subproj/CFURL.c b/CoreFoundation/URL.subproj/CFURL.c
@@ -4786,7 +4786,7 @@ CFURLRef CFURLCreateCopyAppendingPathComponent(CFAllocatorRef allocator, CFURLRe
 #endif
 
     CFMutableStringRef newString;
-    CFStringRef newComp;
+    CFStringRef newComp = NULL;
     CFRange pathRg;
     if (!(url->_flags & HAS_PATH)) {
         result = NULL;
@@ -4815,9 +4815,9 @@ CFURLRef CFURLCreateCopyAppendingPathComponent(CFAllocatorRef allocator, CFURLRe
                 if (isDirectory) {
                     CFStringInsert(newString, pathRg.location + pathRg.length + CFStringGetLength(newComp), CFSTR("/"));
                 }
-                CFRelease(newComp);
                 result = _CFURLCreateWithArbitraryString(allocator, newString, url->_base);
             }
+            if (newComp) CFRelease(newComp);
             CFRelease(newString);
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -4786,7 +4786,7 @@ CFURLRef CFURLCreateCopyAppendingPathComponent(CFAllocatorRef allocator, CFURLRe`
`4786`	`4786`	`#endif`
`4787`	`4787`
`4788`	`4788`	`CFMutableStringRef newString;`
`4789`		`- CFStringRef newComp;`
	`4789`	`+ CFStringRef newComp = NULL;`
`4790`	`4790`	`CFRange pathRg;`
`4791`	`4791`	`if (!(url->_flags & HAS_PATH)) {`
`4792`	`4792`	`result = NULL;`
`@@ -4815,9 +4815,9 @@ CFURLRef CFURLCreateCopyAppendingPathComponent(CFAllocatorRef allocator, CFURLRe`
`4815`	`4815`	`if (isDirectory) {`
`4816`	`4816`	`CFStringInsert(newString, pathRg.location + pathRg.length + CFStringGetLength(newComp), CFSTR("/"));`
`4817`	`4817`	`}`
`4818`		`- CFRelease(newComp);`
`4819`	`4818`	`result = _CFURLCreateWithArbitraryString(allocator, newString, url->_base);`
`4820`	`4819`	`}`
	`4820`	`+ if (newComp) CFRelease(newComp);`
`4821`	`4821`	`CFRelease(newString);`
`4822`	`4822`	`}`
`4823`	`4823`	`}`