Fix invalid pointer arithmetic.

[nmh] / sbr / context_replace.c

diff --git a/sbr/context_replace.c b/sbr/context_replace.c
index 0e9e11467d10d007a3ab13a078b5939f3e0d7370..154f3f6b96f8cc195a23d621ced5c6f9d6bd48e3 100644 (file)
--- a/sbr/context_replace.c
+++ b/sbr/context_replace.c
@@ -1,6 +1,4 @@
-
-/*
- * context_replace.c -- add/replace an entry in the context/profile list
+/* context_replace.c -- add/replace an entry in the context/profile list
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -14,7 +12,9 @@
 void
 context_replace (char *key, char *value)
 {
-    register struct node *np;
+    struct node *np;
+
+    key = FENDNULL(key);
 
     /*
      * If list is empty, allocate head of profile/context list.
@@ -22,7 +22,7 @@ context_replace (char *key, char *value)
     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;
@@ -35,13 +35,12 @@ context_replace (char *key, char *value)
      * this key, and replace its value if found.
      */
     for (np = m_defs;; np = np->n_next) {
-       if (!strcasecmp (np->n_name ? np->n_name : "", key ? key : "")) {
+       if (!strcasecmp(FENDNULL(np->n_name), key)) {
            if (strcmp (value, np->n_field)) {
                if (!np->n_context)
-                   admonish (NULL, "bug: context_replace(key=\"%s\",value=\"%s\")", key, value);
-               if (np->n_field)
-                   free (np->n_field);
-               np->n_field = getcpy (value);
+                   inform("bug: context_replace(key=\"%s\",value=\"%s\"), continuing...", key, value);
+                free(np->n_field);
+               np->n_field = mh_xstrdup(value);
                ctxflags |= CTXMOD;
            }
            return;
@@ -55,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;