pe*alloc

[m6w6/ext-psi] / src / types / decl.c

diff --git a/src/types/decl.c b/src/types/decl.c
index 56ba81d9b4dd956e1e3479658bc4dad0c4d9ea38..5872a32504eacc915137c266ba9a9eb08bd017d9 100644 (file)
--- a/src/types/decl.c
+++ b/src/types/decl.c
@@ -38,7 +38,7 @@
 
 struct psi_decl *psi_decl_init(struct psi_decl_arg *func, struct psi_plist *args)
 {
-       struct psi_decl *d = calloc(1, sizeof(*d));
+       struct psi_decl *d = pecalloc(1, sizeof(*d), 1);
 
        d->func = func;
        d->args = args;
@@ -158,10 +158,11 @@ bool psi_decl_validate_nodl(struct psi_data *data, struct psi_decl *decl,
                struct psi_validate_scope *scope)
 {
        if (!decl->abi) {
-               decl->abi = psi_decl_abi_init(zend_string_init(ZEND_STRL("default"), 1));
+               decl->abi = psi_decl_abi_init(NULL);
        } else if (!psi_decl_abi_validate(data, decl->abi)) {
                data->error(data, decl->abi->token, PSI_WARNING,
-                               "Invalid calling convention: '%s'", decl->abi->token->text->val);
+                               "Invalid calling convention: '%s'",
+                               decl->abi->token->text->val);
                return false;
        }
        if (!psi_decl_arg_validate(data, decl->func, scope)) {