X-Git-Url: http://j8takagi.net/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fword.c;h=cf841cedc4c4668f9daa86c4853b81d595f19a16;hb=8ec48a2a7f650cd1eb4d782c0968d47ebaeebfec;hp=294c4d4d7b777feddae9ee9900bf872ecc845ce5;hpb=93cee61e8fc0ddfb3f23469ad840f3e77067eb48;p=YACASL2.git

diff --git a/src/word.c b/src/word.c
index 294c4d4..cf841ce 100644
--- a/src/word.c
+++ b/src/word.c
@@ -1,9 +1,22 @@
 #include "word.h"
 
+/* 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);
+}
+
 /* 10進数の文字列をWORD値に変換 */
 WORD n2word(const char *str)
 {
     assert(isdigit(*str) || *str == '-');
+
     char *check;
     int n;
     /* WORD値に変換 */
@@ -23,6 +36,7 @@ WORD n2word(const char *str)
 WORD h2word(const char *str)
 {
     assert(*str == '#');
+
     WORD word = 0x0;
     char *check;
     str++;
@@ -42,6 +56,7 @@ WORD h2word(const char *str)
 /* 10進数または16進数の文字列をWORD値に変換 */
 WORD nh2word(const char *str)
 {
+    addcerrlist_word();
     WORD word;
     if(!isdigit(*str) && *str != '-' && *str != '#') {
         setcerr(114, str);    /* not integer */
@@ -58,8 +73,12 @@ 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"), *q = malloc_chk(MAXLEN, "word2n.q");
     int i = 0, j;
+
     do{
         *(p + i++) = word % 10 + '0';
     } while((word /= 10) > 0);
@@ -73,9 +92,13 @@ char *word2n(WORD word)
 /* 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;
+
+    p = bit = malloc_chk(MAXLEN + 1, "word2bit.bit");
     do {
         *p++ = (word & mask) ? '1' : '0';
     } while((mask >>= 1) > 0);