Merge pull request #2766 from klebertarcisio/klebertarcisio-patch-1

millenomi · web-flow · commit 47f2e15ab277 · 2020-08-21T09:28:15.000-07:00
we need to end copiedArgs
diff --git a/CoreFoundation/String.subproj/CFString.c b/CoreFoundation/String.subproj/CFString.c
@@ -7078,7 +7078,8 @@ static Boolean __CFStringAppendFormatCore(CFMutableStringRef outputString, CFStr
 	    newMaxArgNum = specs[curSpec].widthArgNum;
 	}
 	if (sizeArgNum < newMaxArgNum) {
-	    if (specs != localSpecsBuffer) CFAllocatorDeallocate(tmpAlloc, specs);
+	    if (numConfigs > 0) va_end(copiedArgs);
+	    if (specs != localSpecsBuffer) CFAllocatorDeallocate(tmpAlloc, specs);	
 	    if (values != localValuesBuffer) CFAllocatorDeallocate(tmpAlloc, values);
 	    if (formatChars && (formatChars != localFormatBuffer)) CFAllocatorDeallocate(tmpAlloc, formatChars);
             

Original file line number	Diff line number	Diff line change
`@@ -7078,7 +7078,8 @@ static Boolean __CFStringAppendFormatCore(CFMutableStringRef outputString, CFStr`
`7078`	`7078`	`newMaxArgNum = specs[curSpec].widthArgNum;`
`7079`	`7079`	`}`
`7080`	`7080`	`if (sizeArgNum < newMaxArgNum) {`
`7081`		`- if (specs != localSpecsBuffer) CFAllocatorDeallocate(tmpAlloc, specs);`
	`7081`	`+ if (numConfigs > 0) va_end(copiedArgs);`
	`7082`	`+ if (specs != localSpecsBuffer) CFAllocatorDeallocate(tmpAlloc, specs);`
`7082`	`7083`	`if (values != localValuesBuffer) CFAllocatorDeallocate(tmpAlloc, values);`
`7083`	`7084`	`if (formatChars && (formatChars != localFormatBuffer)) CFAllocatorDeallocate(tmpAlloc, formatChars);`
`7084`	`7085`