summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorTaco Hoekwater <taco@elvenkind.com>2012-05-18 11:48:58 +0000
committerTaco Hoekwater <taco@elvenkind.com>2012-05-18 11:48:58 +0000
commitf9ad50b0166c75c3137291222146ea8cd8fb95f7 (patch)
treedce9f412f8f0ddbd1f19cf3745e9fdf2a64b4930 /Build
parent6f3b4474b7561546c99afecf74a9bd9eec732340 (diff)
fix a crash in context on '\endinput \end' (double-free during dealloc)
git-svn-id: svn://tug.org/texlive/trunk@26481 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/web2c/luatexdir/ChangeLog4
-rw-r--r--Build/source/texk/web2c/luatexdir/lua/ltexlib.c3
2 files changed, 7 insertions, 0 deletions
diff --git a/Build/source/texk/web2c/luatexdir/ChangeLog b/Build/source/texk/web2c/luatexdir/ChangeLog
index 52003abece7..5081c7db9a6 100644
--- a/Build/source/texk/web2c/luatexdir/ChangeLog
+++ b/Build/source/texk/web2c/luatexdir/ChangeLog
@@ -1,3 +1,7 @@
+2012-05-18 Taco Hoekwater <taco@luatex.org>
+
+ * lua/ltexlib.c: fix a ConTeXt crash on `\endinput \end`.
+
2012-05-18 Khaled Hosny <khaledhosny@eglug.org>
* tex/commands.h, tex/commands.w, tex/maincontrol.h,
diff --git a/Build/source/texk/web2c/luatexdir/lua/ltexlib.c b/Build/source/texk/web2c/luatexdir/lua/ltexlib.c
index 3cdead69c48..b46df34ec06 100644
--- a/Build/source/texk/web2c/luatexdir/lua/ltexlib.c
+++ b/Build/source/texk/web2c/luatexdir/lua/ltexlib.c
@@ -261,6 +261,9 @@ void luacstring_close(int n)
free(next->text);
t = next;
next = next->next;
+ if (t==read_spindle.tail) {
+ read_spindle.tail = NULL; /* prevent double free */
+ }
free(t);
}
read_spindle.head = NULL;