ハッシュのfreeの方法を修正

diff --git a/VERSION b/VERSION
index 8338111de8350417abb61624817730c8c9ddb260..be4999b5191fd80103b6956a432d934474c9c02f 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-v0.5p1
+v0.5p2
 

diff --git a/src/label.c b/src/label.c
index 63b6fe5dec797bd90c07aff0aab8fcfcb09e9aee..e88cc90ef2469928d8681f6d127aa62e219bc38f 100644 (file)
--- a/src/label.c
+++ b/src/label.c
@@ -166,10 +166,8 @@ void freelabel()
             FREE(p->label->prog);
             FREE(p->label->label);
             FREE(p->label);
-            if(p == labels[i]) {
-                labels[i] = NULL;
-            }
             FREE(p);
         }
+        labels[i] = NULL;
     }
 }

diff --git a/src/struct.c b/src/struct.c
index f6d4128fbfe91036d0c6d7fbacb6e9dd1000d142..22a7df30cbfd3e507d97a581580b88e1f3d37e1e 100644 (file)
--- a/src/struct.c
+++ b/src/struct.c
@@ -141,9 +141,9 @@ void free_cmdtable(CMDTAB_HASH hash)
     for(i = 0; i < CMDTABSIZE; i++) {
         for(p = cmdtab[hash][i]; p != NULL; p = q) {
             q = p->next;
-            cmdtab[hash][i] = NULL;
             FREE(p);
         }
+        cmdtab[hash][i] = NULL;
     }
 }