1 files changed, 2 insertions, 2 deletions

diff --git a/src/xrdb.c b/src/xrdb.c
index cf7a06f8041..fdce4e44a88 100644
--- a/src/xrdb.c
+++ b/src/xrdb.c
@@ -204,12 +204,12 @@ magic_searchpath_decoder (incantation_string, file, return_path)
               string = (char *) alloca (string_size * sizeof (*string));
             }
           bcopy (s, string, len);
-          string[len + 1] = '\0';
+          string[len] = '\0';
           if (decode_magic (string, file, return_path))
             return 1;
         }
 
-      if (p)
+      if (p && *p != 0)
         s = p + 1;
       else
         return 0;