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

[YACASL2.git] / src / assemble.c

diff --git a/src/assemble.c b/src/assemble.c
index 23ce8ac..a69837f 100644 (file)
--- a/src/assemble.c
+++ b/src/assemble.c
@@ -3,6 +3,7 @@
 #include <string.h>
 #include <ctype.h>
 #include <assert.h>
+#include <errno.h>
 
 #include "assemble.h"
 #include "cerr.h"
@@ -183,9 +184,12 @@ WORD getliteral(const char *str, PASS pass)
  */
 void writememory(WORD word, WORD adr, PASS pass)
 {
+    char *n;
+
     /* メモリオーバーの場合、エラー発生 */
     if(adr >= sys->memsize) {
-        setcerr(119, word2n(adr));    /* out of COMET II memory */
+        setcerr(119, (n = word2n(adr)));    /* out of COMET II memory */
+        FREE(n)
         return;
     }
     (sys->memory)[adr] = word;
@@ -257,7 +261,7 @@ void assemble_start(const CMDLINE *cmdl, PASS pass)
         setcerr(106, "");    /* operand count mismatch */
         return;
     }
-    if(cmdl->label == '\0') {
+    if(*(cmdl->label) == '\0') {
         setcerr(107, "");    /* no label in START */
         return;
     }
@@ -604,7 +608,7 @@ bool assembleline(const char *line, PASS pass)
     stat = (cerr->num == 0) ? true : false;
     if(cmdl != NULL) {
         if(stat == true) {
-            if(pass == FIRST && cmdl->label != '\0') {
+            if(pass == FIRST && *(cmdl->label) != '\0') {
                 stat = addlabel(asptr->prog, cmdl->label, asptr->ptr);
             }
         }
@@ -635,6 +639,7 @@ bool assemblefile(const char *file, PASS pass)
     FILE *fp;
 
     if((fp = fopen(file, "r")) == NULL) {
+        cerr->num = errno;
         perror(file);
         return false;
     }