X-Git-Url: http://j8takagi.net/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fword.c;h=6e9fb1702910f1e1ea4ff8cee583b453ececf926;hb=0d225ac1f580c59da7a063ef52da35c0af254dd3;hp=3b309671470d78b0333ccaa4ed985808e7a67bb3;hpb=406fd6490ad76b4573b6ce9f8d322d92f13d27d8;p=YACASL2.git

diff --git a/src/word.c b/src/word.c
index 3b30967..6e9fb17 100644
--- a/src/word.c
+++ b/src/word.c
@@ -1,11 +1,13 @@
 #include "word.h"
+#include "cerr.h"
 
 /* wordのエラー定義 */
-CERRARRAY cerr_word[] = {
+CERR cerr_word[] = {
     { 114, "not integer" },
     { 115, "not hex" },
     { 116, "out of hex range" },
 };
+
 bool addcerrlist_word()
 {
     return addcerrlist(ARRAYSIZE(cerr_word), cerr_word);
@@ -72,24 +74,33 @@ WORD nh2word(const char *str)
 /* WORD値を10進数の文字列に変換 */
 char *word2n(WORD word)
 {
-    char *p = malloc(6), *q = malloc(6);
+    enum {
+        MAXLEN = 6,        /* WORD値を10進数で表したときの最大桁数 */
+    };
+    char *p = malloc_chk(MAXLEN, "word2n.p"), *digit = malloc_chk(MAXLEN, "word2n.digit");
     int i = 0, j;
+
     do{
         *(p + i++) = word % 10 + '0';
     } while((word /= 10) > 0);
     for(j = 0; j < i; j++) {
-        *(q + j) = *(p + (i - 1) - j);
+        *(digit + j) = *(p + (i - 1) - j);
     }
-    *(q + j + 1) = '\0';
-    return q;
+    *(digit + j + 1) = '\0';
+    free_chk(p, "word2n.p");
+    return digit;
 }
 
 /* WORD値を2進数の文字列に変換 */
 char *word2bit(const WORD word)
 {
+    enum {
+        MAXLEN = 16,        /* WORD値を2進数で表したときの最大桁数 */
+    };
     WORD mask = 0x8000;
-    char *bit = malloc(16 + 1), *p;
-    p = bit;
+    char *bit, *p;
+
+    bit = p = malloc_chk(MAXLEN + 1, "word2bit.bit");
     do {
         *p++ = (word & mask) ? '1' : '0';
     } while((mask >>= 1) > 0);