X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Fcpp_tokiter.c;h=8073281ea7c80f12043e2d0644edbd6844dee53b;hp=9ebe1915f21ea059ef07feb57a1a400cc31d5a91;hb=47dd00ab6df0a093b13d4f573ba01c79a6bcc72f;hpb=2fa436074ca9a5e87f39b696de832fa2188fcfc6

diff --git a/src/cpp_tokiter.c b/src/cpp_tokiter.c
index 9ebe191..8073281 100644
--- a/src/cpp_tokiter.c
+++ b/src/cpp_tokiter.c
@@ -259,7 +259,7 @@ static size_t psi_cpp_tokiter_expand_tokens(struct psi_cpp *cpp,
 
 				tmp_tok = psi_token_init(old_tok->type, "", 0,
 						target->col, target->line,
-						target->file ? target->file->val : "");
+						target->file ? target->file : zend_empty_string);
 
 				new_tok = psi_token_cat(NULL, 3, tmp_tok, old_tok, tok);
 				psi_token_free(&old_tok);
@@ -268,7 +268,8 @@ static size_t psi_cpp_tokiter_expand_tokens(struct psi_cpp *cpp,
 				exp_tokens[n - 1] = new_tok;
 			} else {
 				new_tok = psi_token_init(stringify ? PSI_T_QUOTED_STRING : tok->type,
-						tok->text->val, tok->text->len, target->col, target->line, target->file?:"");
+						tok->text->val, tok->text->len, target->col, target->line,
+						target->file ?: zend_empty_string);
 
 				exp_tokens[n++] = new_tok;
 			}