summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog7
-rw-r--r--renderer.c4
2 files changed, 9 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index ccbbfd4..60af45c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+foomatic-filters (4.0-20090301-3) unstable; urgency=low
+
+ * Fix another bug in foomatic-rip that led to null pointer dereferences
+ when using the hl1250 driver. (Closes: #518117)
+
+ -- Chris Lawrence <lawrencc@debian.org> Sun, 08 Mar 2009 05:38:26 -0500
+
foomatic-filters (4.0-20090301-2) unstable; urgency=low
* Fix bug in foomatic-rip that could leave two 'gs' calls in the command
diff --git a/renderer.c b/renderer.c
index f003206..48d9dc9 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--;