procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix recently-introduced SAFE_FREE bug

Browse source 
Problem reported by Andy Moreton (Bug#31996).
* src/lisp.h (union specbinding.unwind_array):
Remove unused member func.  Move array after nelts, as this is
likely to generate more efficient code in safe_free, which can
call xfree with the same value either way.
(safe_free): Also handle SPECPDL_UNWIND_AWAY.
This commit is contained in:
Paul Eggert 2018-06-28 13:49:48 -07:00
parent 76eda952b0
commit ddc4371a89
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/lisp.h
View file

@ -3058,9 +3058,8 @@ union specbinding
} unwind;
struct {
ENUM_BF (specbind_tag) kind : CHAR_BIT;
void (*func) (Lisp_Object);
Lisp_Object *array;
ptrdiff_t nelts;
Lisp_Object *array;
} unwind_array;
struct {
ENUM_BF (specbind_tag) kind : CHAR_BIT;
@ -4543,9 +4542,16 @@ safe_free (ptrdiff_t sa_count)
while (specpdl_ptr != specpdl + sa_count)
{
specpdl_ptr--;
eassert (specpdl_ptr->kind == SPECPDL_UNWIND_PTR
&& specpdl_ptr->unwind_ptr.func == xfree);
xfree (specpdl_ptr->unwind_ptr.arg);
if (specpdl_ptr->kind == SPECPDL_UNWIND_PTR)
{
eassert (specpdl_ptr->unwind_ptr.func == xfree);
xfree (specpdl_ptr->unwind_ptr.arg);
}
else
{
eassert (specpdl_ptr->kind == SPECPDL_UNWIND_ARRAY);
xfree (specpdl_ptr->unwind_array.array);
}
}
}