Merge from origin/emacs-25

[gnu-emacs] / src / callproc.c

diff --git a/src/callproc.c b/src/callproc.c
index 07297820cacf041ef4ee6c05b8441906692b5d47..7008b916dad8bac8e0da5df56090a4e92b91cc1d 100644 (file)
--- a/src/callproc.c
+++ b/src/callproc.c
@@ -1094,7 +1094,7 @@ add_env (char **env, char **new_env, char *string)
       char *p = *ep, *q = string;
       while (ok)
        {
-         if (*q != *p)
+         if (*p && *q != *p)
            break;
          if (*q == 0)
            /* The string is a lone variable name; keep it for now, we