Valgrindで判明したメモリーに関する問題を修正

[YACASL2.git] / src / word.c

diff --git a/src/word.c b/src/word.c
index 415dfa4..34a3946 100644 (file)
--- a/src/word.c
+++ b/src/word.c
@@ -95,9 +95,9 @@ WORD nh2word(const char *str)
 char *word2n(WORD word)
 {
     enum {
-        MAXLEN = 6,        /* WORD値を10進数で表したときの最大桁数 */
+        MAXLEN = 5,        /* WORD値を10進数で表したときの最大桁数 */
     };
-    char *p = malloc_chk(MAXLEN, "word2n.p"), *digit = malloc_chk(MAXLEN, "word2n.digit");
+    char *p = malloc_chk(MAXLEN + 1, "word2n.p"), *digit = malloc_chk(MAXLEN + 1, "word2n.digit");
     int i = 0, j;
 
     do{
@@ -135,12 +135,14 @@ char *word2bit(const WORD word)
  */
 void print_dumpword(WORD word, bool logicalmode)
 {
+    char *b;
+
     if(logicalmode == true) {
         fprintf(stdout, "%6d", word);
     } else {
         fprintf(stdout, "%6d", (signed short)word);
     }
-    fprintf(stdout, " = #%04X = %s", word, word2bit(word));
+    fprintf(stdout, " = #%04X = %s", word, (b = word2bit(word)));
     /* 「文字の組」の符号表に記載された文字と、改行（CR）／タブを表示 */
     if(word >= 0x20 && word <= 0x7E) {
         fprintf(stdout, " = \'%c\'", word);
@@ -150,4 +152,5 @@ void print_dumpword(WORD word, bool logicalmode)
         fprintf(stdout, " = \'\\t\'");
     }
     fprintf(stdout, "\n");
+    FREE(b);
 }