more: avoid out-of-bound access

The realloc() needs to happen before that memory is used.

Signed-off-by: Thomas Weißschuh <thomas@t-8ch.de>

diff --git a/text-utils/more.c b/text-utils/more.c
index 0a13b42438356ec352fc7a9bdf6360f3e2ec0eec..22adaab68a8cf10f314e125d9b873896b83faefd 100644 (file)
--- a/text-utils/more.c
+++ b/text-utils/more.c
@@ -356,11 +356,11 @@ static void env_argscan(struct more_control *ctl, const char *s)
        env_argv = xmalloc(sizeof(char *) * size);
        env_argv[0] = _("MORE environment variable");   /* program name */
        for (tok = strtok_r(str, delim, &key); tok; tok = strtok_r(NULL, delim, &key)) {
-               env_argv[env_argc++] = tok;
-               if (size < env_argc) {
+               if (size == env_argc) {
                        size *= 2;
                        env_argv = xrealloc(env_argv, sizeof(char *) * size);
                }
+               env_argv[env_argc++] = tok;
        }
 
        argscan(ctl, env_argc, env_argv);