Commit 68db37aa authored by Kim F. Storm's avatar Kim F. Storm

(malloc_initialize_hook): Don't free malloc_state_ptr if

XMALLOC_OVERRUN_CHECK to avoid crash during load.
parent 212f33f1
......@@ -584,7 +584,7 @@ init_cmdargs (argc, argv, skip_args)
They are decoded in the function command-line after we know
locale-coding-system. */
Vcommand_line_args
= Fcons (make_unibyte_string (argv[i], strlen (argv[i])),
= Fcons (make_unibyte_string (argv[i], strlen (argv[i])),
Vcommand_line_args);
}
......@@ -748,7 +748,9 @@ malloc_initialize_hook ()
}
malloc_set_state (malloc_state_ptr);
#ifndef XMALLOC_OVERRUN_CHECK
free (malloc_state_ptr);
#endif
}
else
{
......@@ -1984,9 +1986,9 @@ sort_args (argc, argv)
bcopy (new, argv, sizeof (char *) * argc);
free (options);
free (new);
free (priority);
xfree (options);
xfree (new);
xfree (priority);
}
DEFUN ("kill-emacs", Fkill_emacs, Skill_emacs, 0, 1, "P",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment