X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Fcpp_tokiter.c;h=57645ec0db2ffccdd906116b29382777547c321e;hp=b62b351c21cc01ce8f458e754f489e6baa2d1a90;hb=e48a77547645d7985d11880f463d811bbe10da6a;hpb=7fb50f31e25b1cc307ef59fb9cbfe71e4c2283c5

diff --git a/src/cpp_tokiter.c b/src/cpp_tokiter.c
index b62b351..57645ec 100644
--- a/src/cpp_tokiter.c
+++ b/src/cpp_tokiter.c
@@ -257,13 +257,14 @@ static size_t psi_cpp_tokiter_expand_tokens(struct psi_cpp *cpp,
 			}
 
 			if (paste && n > 0 && exp_tokens[n - 1]) {
-				struct psi_token *old_tok = exp_tokens[n - 1];
+				struct psi_token *tmp_tok, *old_tok = exp_tokens[n - 1];
 
-				new_tok = psi_token_init(old_tok->type, "", 0,
+				tmp_tok = psi_token_init(old_tok->type, "", 0,
 						target->col, target->line, target->file?:"");
 
-				new_tok = psi_token_cat(NULL, 2, new_tok, old_tok, tok);
+				new_tok = psi_token_cat(NULL, 3, tmp_tok, old_tok, tok);
 				free(old_tok);
+				free(tmp_tok);
 
 				exp_tokens[n - 1] = new_tok;
 			} else {
@@ -319,10 +320,6 @@ static struct psi_plist **psi_cpp_tokiter_read_call_tokens(
 
 	arg_tokens[0] = psi_plist_init(NULL);
 
-	/* free macro name token on success */
-	tok = psi_cpp_tokiter_current(cpp);
-	free_tokens = psi_plist_add(free_tokens, &tok);
-
 	/* next token must be a LPAREN for a macro call */
 	psi_cpp_tokiter_next(cpp);
 	tok = psi_cpp_tokiter_current(cpp);
@@ -445,6 +442,8 @@ static bool psi_cpp_tokiter_expand_call(struct psi_cpp *cpp,
 
 	/* back to where we took off */
 	psi_cpp_tokiter_seek(cpp, start);
+
+	free(target);
 	++cpp->expanded;
 	return true;
 }