Fix invalid pointer arithmetic.

[nmh] / sbr / context_del.c

diff --git a/sbr/context_del.c b/sbr/context_del.c
index b359cb75031b34a2a407d3f8885815c0c5531c05..592af0cad34e0d0e17593283274fc2007eb7ba16 100644 (file)
--- a/sbr/context_del.c
+++ b/sbr/context_del.c
@@ -1,6 +1,4 @@
-
-/*
- * context_del.c -- delete an entry from the context/profile list
+/* context_del.c -- delete an entry from 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
@@ -20,8 +18,9 @@ context_del (char *key)
 {
     struct node *np, *pp;
 
+    key = FENDNULL(key);
     for (np = m_defs, pp = NULL; np; pp = np, np = np->n_next) {
-       if (!strcasecmp (np->n_name ? np->n_name : "", key ? key : "")) {
+       if (!strcasecmp(FENDNULL(np->n_name), key)) {
            if (!np->n_context)
                inform("bug: context_del(key=\"%s\"), continuing...", np->n_name);
            if (pp)
@@ -29,7 +28,7 @@ context_del (char *key)
            else
                m_defs = np->n_next;
            free (np->n_name);
-            mh_xfree(np->n_field);
+            free(np->n_field);
            free(np);
            ctxflags |= CTXMOD;
            return 0;