diff --git a/edit/ChangeLog b/edit/ChangeLog
index 5cb75e090..6784d3503 100644
--- a/edit/ChangeLog
+++ b/edit/ChangeLog
@@ -1,5 +1,8 @@
 2002-08-20  Pavel Roskin  <proski@gnu.org>
 
+	* editcmd.c (freestrs): Set freed strings to NULL.
+	(catstrs): Use g_malloc() and g_free().
+
 	* editcmd.c (freestrs): New function to clean temporary strings.
 	* edit.c (edit_clean): Call freestrs().
 
diff --git a/edit/editcmd.c b/edit/editcmd.c
index d1d6f35a7..8e60650a2 100644
--- a/edit/editcmd.c
+++ b/edit/editcmd.c
@@ -130,10 +130,9 @@ char *catstrs (const char *first,...)
     len++;
 
     i = (i + 1) % 16;
-    if (stacked[i])
-	free (stacked[i]);
+    g_free (stacked[i]);
 
-    stacked[i] = malloc (len);
+    stacked[i] = g_malloc (len);
     va_end (ap);
     va_start (ap, first);
     strcpy (stacked[i], first);
@@ -150,8 +149,8 @@ void freestrs(void)
     int i;
 
     for (i = 0; i < sizeof(stacked) / sizeof(stacked[0]); i++) {
-	if (stacked[i])
-	    free (stacked[i]);
+	g_free (stacked[i]);
+	stacked[i] = NULL;
     }
 }