X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Fmodule.c;h=508fdea64e5da754e3c2283423a90cef33a0187f;hp=b8d23008ffcaa4f73139b92224c29f9631234636;hb=a6ffb2bfbf83ef3511cc356bd931d460feabe7a2;hpb=3c53642a0adccd4b602d147833da24eb4b73bccc

diff --git a/src/module.c b/src/module.c
index b8d2300..508fdea 100644
--- a/src/module.c
+++ b/src/module.c
@@ -360,17 +360,20 @@ void psi_to_array(zval *return_value, token_t t, impl_val *ret_val, set_value *s
 				set_value *sub_set = set->inner[i];
 				decl_var *sub_var = sub_set->vars->vars[0];
 				decl_arg *sub_arg = sub_var->arg;
-				token_t t = real_decl_type(sub_arg->type)->type;
-				void *ptr = malloc(sub_arg->layout->len);
-
-				memcpy(ptr, (char *) ret_val->ptr + sub_arg->layout->pos,
-						sub_arg->layout->len);
-				tmp_ptr = enref_impl_val(ptr, sub_arg->var);
-				sub_set->func->handler(&ztmp, t, tmp_ptr, sub_set, sub_var);
-				add_assoc_zval(return_value, sub_var->name, &ztmp);
-				free(tmp_ptr);
-				if (tmp_ptr != ptr) {
-					free(ptr);
+
+				if (sub_arg) {
+					token_t t = real_decl_type(sub_arg->type)->type;
+					void *ptr = malloc(sub_arg->layout->len);
+
+					memcpy(ptr, (char *) ret_val->ptr + sub_arg->layout->pos,
+							sub_arg->layout->len);
+					tmp_ptr = enref_impl_val(ptr, sub_arg->var);
+					sub_set->func->handler(&ztmp, t, tmp_ptr, sub_set, sub_var);
+					add_assoc_zval(return_value, sub_var->name, &ztmp);
+					free(tmp_ptr);
+					if (tmp_ptr != ptr) {
+						free(ptr);
+					}
 				}
 			}
 		}