summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2008-03-13 00:44:55 +0000
committerKarl Berry <karl@freefriends.org>2008-03-13 00:44:55 +0000
commit7ed0b83a3a56a7a0028fb39145b8d9306f387ab9 (patch)
tree04e32ebe40075ba37ea44a3b5e66fa0b273fe79d
parentdd5658bfcaf00e6323bbb5c4b00bc8da4127afc9 (diff)
seg fault fix from Arthur R
git-svn-id: svn://tug.org/texlive/trunk@6948 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/web2c/omegafonts/ChangeLog6
-rw-r--r--Build/source/texk/web2c/omegafonts/font_routines.c4
2 files changed, 8 insertions, 2 deletions
diff --git a/Build/source/texk/web2c/omegafonts/ChangeLog b/Build/source/texk/web2c/omegafonts/ChangeLog
index 4fa26b5007a..ffae5997eac 100644
--- a/Build/source/texk/web2c/omegafonts/ChangeLog
+++ b/Build/source/texk/web2c/omegafonts/ChangeLog
@@ -1,3 +1,9 @@
+2008-03-13 Karl Berry <karl@tug.org>
+
+ * font_routines.c (font_no_incr): change test to avoid reported
+ segfault on http://norgz.info/download/gregorio.ovp. Report
+ from Elie Roux, 11 Mar 2008 17:19:46, fix from Arthur Reutenauer.
+
2008-03-02 Karl Berry <karl@tug.org>
* Makefile.in (omfonts.o): depend on y_tab.h.
diff --git a/Build/source/texk/web2c/omegafonts/font_routines.c b/Build/source/texk/web2c/omegafonts/font_routines.c
index db3413d80e1..32be7d412a6 100644
--- a/Build/source/texk/web2c/omegafonts/font_routines.c
+++ b/Build/source/texk/web2c/omegafonts/font_routines.c
@@ -3,7 +3,7 @@
This file is part of Omega,
which is based on the web2c distribution of TeX,
-Copyright (c) 1994--2001 John Plaice and Yannis Haralambous
+Copyright (C) 1994--2001 John Plaice and Yannis Haralambous
Copyright (C) 2005, 2006 Roozbeh Pournader
Omega is free software; you can redistribute it and/or modify
@@ -57,7 +57,7 @@ font_table_init(void)
void
font_no_incr(void)
{
- if (no_fonts == font_table_size) {
+ if (no_fonts * BLOCK == font_table_size) {
font_table_size += BLOCK;
font_table = (font *) xrealloc(font_table, font_table_size);
}