From 9d9c706369af38dbd2673155a7047ce196e09e53 Mon Sep 17 00:00:00 2001 From: Didier Raboud Date: Sun, 23 May 2010 00:08:55 +0200 Subject: Imported Upstream version 4.0-20090311 --- ChangeLog | 7 ++++++- VERSION.full | 2 +- renderer.c | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 69712ea..7dfe2f6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2009-03-08 Till Kamppeter + + * renderer.c: Fixed segmentation fault in JCL option handling (bugs + #311 and #317). + 2009-03-07 Till Kamppeter * foomatic-rip.1.in: Fixed typos. @@ -7,7 +12,7 @@ Foomatic 3.x-generated PPD files for the "Postscript" driver, leading to duplicate calls of Ghostscript (bug #316). - * foomaticrip.c: Fixed buffer overflow (bug #311). + * foomaticrip.c: Fixed buffer overflow mentioned in bug #311. 2009-02-11 Lars Uebernickel * foomaticrip.c: The value of the "execpath" variable in the config diff --git a/VERSION.full b/VERSION.full index c103a43..0e15d60 100644 --- a/VERSION.full +++ b/VERSION.full @@ -1 +1 @@ -4.0.0.201 +4.0.0.203 diff --git a/renderer.c b/renderer.c index f003206..48a56aa 100644 --- a/renderer.c +++ b/renderer.c @@ -190,7 +190,7 @@ static int jcl_keywords_equal(const char *jclline1, const char *jclline2, j1 = strstr(jclline1, jclstr); if (!j1) return 0; if (!(p1 = strchr(skip_whitespace(j1), '='))) - p1 = j1[strlen(j1)]; + p1 = j1 + strlen(j1); p1--; while (p1 > j1 && isspace(*p1)) p1--; @@ -198,7 +198,7 @@ static int jcl_keywords_equal(const char *jclline1, const char *jclline2, j2 = strstr(jclline2, jclstr); if (!j2) return 0; if (!(p2 = strchr(skip_whitespace(j2), '='))) - p2 = j2[strlen(j2)]; + p2 = j2 + strlen(j2); p2--; while (p2 > j2 && isspace(*p2)) p2--; -- cgit v1.2.3