projects
/
m6w6
/
ext-psi
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
fix leaks
[m6w6/ext-psi]
/
src
/
cpp_tokiter.c
diff --git
a/src/cpp_tokiter.c
b/src/cpp_tokiter.c
index 9ebe1915f21ea059ef07feb57a1a400cc31d5a91..8073281ea7c80f12043e2d0644edbd6844dee53b 100644
(file)
--- 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,
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);
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,
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;
}
exp_tokens[n++] = new_tok;
}