Merge pull request #3203 from techee/cxx_mem_leak

cxx: use a trashbox for deleteing tokens allocated for anonymous parameters
geany · Sep 21, 2022 · 740377e · 740377e
2 parents 0bc92b0 + fc852aa
commit 740377e
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/ctags/parsers/cxx/cxx_parser_function.c b/ctags/parsers/cxx/cxx_parser_function.c
@@ -1889,6 +1889,8 @@ void cxxParserEmitFunctionParameterTags(CXXTypedVariableSet * pInfo)
 
 		if(pTypeName)
 		{
+			if (pInfo->uAnonymous & (0x1u << i))
+				PARSER_TRASH_BOX_TAKE_BACK (pInfo->aIdentifiers[i]);
 			cxxTokenDestroy(pInfo->aIdentifiers[i]);
 			cxxTokenDestroy(pTypeName);
 		}
@@ -2180,6 +2182,7 @@ bool cxxParserTokenChainLooksLikeFunctionParameterList(
 						pIdentifier->iLineNumber = t->pPrev->iLineNumber;
 						pIdentifier->oFilePosition = t->pPrev->oFilePosition;
 						pParamInfo->uAnonymous |= (0x1u << pParamInfo->uCount);
+						PARSER_TRASH_BOX (pIdentifier, cxxTokenDestroy);
 					}
 					pParamInfo->aIdentifiers[pParamInfo->uCount] = pIdentifier;
 					pParamInfo->uCount++;
@@ -2233,7 +2236,7 @@ bool cxxParserTokenChainLooksLikeFunctionParameterList(
 			pParamInfo->uCount++;
 
 			PARSER_TRASH_BOX (pFakeStart, cxxTokenDestroy);
-			/* pFakeId may be destroyed via pParamInfo->aIdentifiers[i]. */
+			PARSER_TRASH_BOX (pFakeId, cxxTokenDestroy);
 		}
 
 		if(cxxTokenTypeIs(t,CXXTokenTypeClosingParenthesis))