X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/042f5bed7ff3e5b34ff3166951a7b98bf6bbf105..94187a80bd60baab4b9c4b949ad820d730578123:/sbr/context_replace.c?ds=sidebyside

diff --git a/sbr/context_replace.c b/sbr/context_replace.c
index 1027dcf6..154f3f6b 100644
--- a/sbr/context_replace.c
+++ b/sbr/context_replace.c
@@ -14,13 +14,15 @@ context_replace (char *key, char *value)
 {
     struct node *np;
 
+    key = FENDNULL(key);
+
     /*
      * If list is empty, allocate head of profile/context list.
      */
     if (!m_defs) {
 	NEW(np);
         m_defs = np;
-	np->n_name = getcpy (key);
+	np->n_name = mh_xstrdup(key);
 	np->n_field = getcpy (value);
 	np->n_context = 1;
 	np->n_next = NULL;
@@ -33,11 +35,11 @@ context_replace (char *key, char *value)
      * this key, and replace its value if found.
      */
     for (np = m_defs;; np = np->n_next) {
-	if (!strcasecmp (FENDNULL(np->n_name), FENDNULL(key))) {
+	if (!strcasecmp(FENDNULL(np->n_name), key)) {
 	    if (strcmp (value, np->n_field)) {
 		if (!np->n_context)
 		    inform("bug: context_replace(key=\"%s\",value=\"%s\"), continuing...", key, value);
-                mh_xfree(np->n_field);
+                free(np->n_field);
 		np->n_field = mh_xstrdup(value);
 		ctxflags |= CTXMOD;
 	    }
@@ -52,7 +54,7 @@ context_replace (char *key, char *value)
      */
     NEW(np->n_next);
     np = np->n_next;
-    np->n_name = getcpy (key);
+    np->n_name = mh_xstrdup(key);
     np->n_field = getcpy (value);
     np->n_context = 1;
     np->n_next = NULL;