X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/177f020f122827214159c46dcfe7ded1e3c8d1c3..94187a80bd60baab4b9c4b949ad820d730578123:/sbr/context_find.c

diff --git a/sbr/context_find.c b/sbr/context_find.c
index 3a7b920d..f4fe7ed1 100644
--- a/sbr/context_find.c
+++ b/sbr/context_find.c
@@ -13,9 +13,10 @@ context_find (const char *str)
 {
     struct node *np;
 
+    str = FENDNULL(str);
     for (np = m_defs; np; np = np->n_next)
-	if (!strcasecmp (np->n_name ? np->n_name : "", str ? str : ""))
-	    return (np->n_field);
+	if (!strcasecmp(FENDNULL(np->n_name), str))
+	    return np->n_field;
 
     return NULL;
 }
@@ -59,9 +60,11 @@ context_find_by_type (const char *string, const char *type,
 int
 context_find_prefix (const char *prefix) {
     struct node *np;
+    size_t len;
 
+    len = strlen(prefix);
     for (np = m_defs; np; np = np->n_next) {
-	if (np->n_name  &&  ! strncasecmp (np->n_name, prefix, strlen(prefix))) {
+	if (np->n_name  &&  ! strncasecmp (np->n_name, prefix, len)) {
 	    return 1;
         }
     }