X-Git-Url: http://j8takagi.net/cgi-bin/gitweb.cgi?p=YACASL2.git;a=blobdiff_plain;f=src%2Fword.c;h=6e9fb1702910f1e1ea4ff8cee583b453ececf926;hp=cf841cedc4c4668f9daa86c4853b81d595f19a16;hb=9a90bce10b932f8aa7045b9dceb4b99156666920;hpb=288d61424576d1aae956ea8e4b5fb89dc25909db

diff --git a/src/word.c b/src/word.c
index cf841ce..6e9fb17 100644
--- a/src/word.c
+++ b/src/word.c
@@ -1,4 +1,5 @@
 #include "word.h"
+#include "cerr.h"
 
 /* wordのエラー定義 */
 CERR cerr_word[] = {
@@ -76,17 +77,18 @@ char *word2n(WORD word)
     enum {
         MAXLEN = 6,        /* WORD値を10進数で表したときの最大桁数 */
     };
-    char *p = malloc_chk(MAXLEN, "word2n.p"), *q = malloc_chk(MAXLEN, "word2n.q");
+    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進数の文字列に変換 */
@@ -98,7 +100,7 @@ char *word2bit(const WORD word)
     WORD mask = 0x8000;
     char *bit, *p;
 
-    p = bit = malloc_chk(MAXLEN + 1, "word2bit.bit");
+    bit = p = malloc_chk(MAXLEN + 1, "word2bit.bit");
     do {
         *p++ = (word & mask) ? '1' : '0';
     } while((mask >>= 1) > 0);