summaryrefslogtreecommitdiff
path: root/Build/source/texk
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/texk')
-rw-r--r--Build/source/texk/web2c/pdftexdir/ChangeLog8
-rw-r--r--Build/source/texk/web2c/pdftexdir/pdftex.web2
2 files changed, 9 insertions, 1 deletions
diff --git a/Build/source/texk/web2c/pdftexdir/ChangeLog b/Build/source/texk/web2c/pdftexdir/ChangeLog
index bdc4f56dbff..717bb9988a1 100644
--- a/Build/source/texk/web2c/pdftexdir/ChangeLog
+++ b/Build/source/texk/web2c/pdftexdir/ChangeLog
@@ -1,3 +1,11 @@
+2016-04-06 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
+
+ * pdftex.web (Replace |z|...): also check alpha<@'400
+ to avoid crash with pathological/recursive virtual fonts.
+ Report from Hans and Luigi, 12 Nov 2015 19:51:59 (et al.), per
+ http://tracker.luatex.org/view.php?id=560#c1508
+ (Installed by Karl.)
+
2016-04-06 Karl Berry <karl@tug.org>
* pdftexextra.h (COPYRIGHT_HOLDER): don't specifically mention peb
diff --git a/Build/source/texk/web2c/pdftexdir/pdftex.web b/Build/source/texk/web2c/pdftexdir/pdftex.web
index 15147b33ab3..180f36e934c 100644
--- a/Build/source/texk/web2c/pdftexdir/pdftex.web
+++ b/Build/source/texk/web2c/pdftexdir/pdftex.web
@@ -13214,7 +13214,7 @@ end
@ @<Replace |z|...@>=
begin alpha:=16;
if z>=@'1000000000 then pdf_error("font", "size is too large");
-while z>=@'40000000 do
+while (z>=@'40000000) and (alpha<@'400) do
begin z:=z div 2; alpha:=alpha+alpha;
end;
beta:=256 div alpha; alpha:=alpha*z;