X-Git-Url: http://j8takagi.net/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fcmd.c;h=eff58de1cdcaea5be3172c7bea992e4cae098030;hb=e934f979236c43e098be7b500e7bc11103911630;hp=67d7c2a768fe455479f649cbdb264ebbb6fccebe;hpb=4ee27a568fb9222907a566e59aaefe248f08a8e4;p=YACASL2.git diff --git a/src/cmd.c b/src/cmd.c index 67d7c2a..eff58de 100644 --- a/src/cmd.c +++ b/src/cmd.c @@ -52,7 +52,7 @@ unsigned hash_cmdtype(const char *cmd, CMDTYPE type) { /* 命令をセット */ keys[0] = malloc_chk(sizeof(HKEY), "hash_cmdtype.key"); keys[0]->type = CHARS; - keys[0]->val.s = strdup(cmd); + keys[0]->val.s = strdup_chk(cmd, "keys[0].val"); /* 命令タイプをセット */ keys[1] = malloc_chk(sizeof(HKEY), "hash_cmdtype.key"); keys[1]->type = INT; @@ -69,7 +69,7 @@ bool create_cmdtype_code() int i; cmdtabsize = comet2cmdsize; - cmdtype_code = malloc_chk(cmdtabsize * sizeof(CMDTAB *), "cmdtype_code"); + cmdtype_code = calloc_chk(cmdtabsize, sizeof(CMDTAB *), "cmdtype_code"); for(i = 0; i < cmdtabsize; i++) { *(cmdtype_code + i) = NULL; } @@ -140,7 +140,7 @@ bool create_code_type() int i; cmdtabsize = comet2cmdsize; - code_type = malloc_chk(cmdtabsize * sizeof(CMDTAB *), "code_type"); + code_type = calloc_chk(cmdtabsize, sizeof(CMDTAB *), "code_type"); for(i = 0; i < cmdtabsize; i++) { *(code_type + i) = NULL; }