summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Lawrence <lawrencc@debian.org>2009-03-08 18:55:48 -0500
committerDidier Raboud <didier@raboud.com>2010-05-23 00:08:54 +0200
commitb0851bfb7303aecdfb16668cf769efba31c65137 (patch)
tree4ca39c887d6e21746b6258b0da15c6d8ed9d1c94
parentdc5b0044ec89ff1242eef765f2931354d140149b (diff)
Imported Debian patch 4.0-20090308-1debian/4.0-20090308-1
-rw-r--r--debian/changelog6
-rw-r--r--renderer.c4
2 files changed, 8 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 60af45c..bb68f6b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+foomatic-filters (4.0-20090308-1) unstable; urgency=low
+
+ * New upstream release; fixes another potential segfault.
+
+ -- Chris Lawrence <lawrencc@debian.org> Sun, 08 Mar 2009 18:55:48 -0500
+
foomatic-filters (4.0-20090301-3) unstable; urgency=low
* Fix another bug in foomatic-rip that led to null pointer dereferences
diff --git a/renderer.c b/renderer.c
index 48d9dc9..f003206 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--;