null pointer safeguards

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

diff --git a/src/types/decl_struct.c b/src/types/decl_struct.c
index 973f6333537163134e900ceda726596858c60720..9ba53e97348a3856dc0d98e806b140a889068bd7 100644 (file)
--- a/src/types/decl_struct.c
+++ b/src/types/decl_struct.c
@@ -84,6 +84,9 @@ bool psi_decl_struct_validate(struct psi_data *data, struct psi_decl_struct *s,
        size_t i, pos, len, size, align;
        struct psi_decl_arg *darg, *prev_arg;
 
+       if (!s) {
+               return false;
+       }
        if (psi_validate_stack_has_struct(type_stack, s->name)) {
                return true;
        }
@@ -128,7 +131,7 @@ bool psi_decl_struct_validate(struct psi_data *data, struct psi_decl_struct *s,
                        }
                } else {
                        if (i) {
-                               if (prev_arg->layout->bfw && darg->layout->bfw) {
+                               if (prev_arg->layout && prev_arg->layout->bfw && darg->layout && darg->layout->bfw) {
                                        struct psi_decl_type *real = NULL;
                                        size_t max_bfw = 8 * psi_decl_type_get_size(prev_arg->type, &real);
 
@@ -198,6 +201,9 @@ bool psi_decl_struct_validate(struct psi_data *data, struct psi_decl_struct *s,
 
 size_t psi_decl_struct_get_align(struct psi_decl_struct *s)
 {
+       if (!s) {
+               return 0;
+       }
        if (!s->align) {
                s->align = psi_decl_type_get_args_align(s->args);
        }