mips32, dsp563xx: fix segfault on Gdb attach

[openocd.git] / src / target / openrisc / or1k.c

diff --git a/src/target/openrisc/or1k.c b/src/target/openrisc/or1k.c
index a7b3ed278675c24ffc89f47ada23b34c6538179f..5852fc71fc96d33f1f5f4588188e26bc89f8629a 100644 (file)
--- a/src/target/openrisc/or1k.c
+++ b/src/target/openrisc/or1k.c
@@ -513,7 +513,7 @@ static struct reg_cache *or1k_build_reg_cache(struct target *target)
        struct or1k_common *or1k = target_to_or1k(target);
        struct reg_cache **cache_p = register_get_last_cache_p(&target->reg_cache);
        struct reg_cache *cache = malloc(sizeof(struct reg_cache));
-       struct reg *reg_list = malloc((or1k->nb_regs) * sizeof(struct reg));
+       struct reg *reg_list = calloc(or1k->nb_regs, sizeof(struct reg));
        struct or1k_core_reg *arch_info =
                malloc((or1k->nb_regs) * sizeof(struct or1k_core_reg));
        struct reg_feature *feature;
@@ -1169,11 +1169,11 @@ static int or1k_init_target(struct command_context *cmd_ctx,
 
 static int or1k_target_create(struct target *target, Jim_Interp *interp)
 {
-       struct or1k_common *or1k = calloc(1, sizeof(struct or1k_common));
-
        if (target->tap == NULL)
                return ERROR_FAIL;
 
+       struct or1k_common *or1k = calloc(1, sizeof(struct or1k_common));
+
        target->arch_info = or1k;
 
        or1k_create_reg_list(target);