From ba49ab606cb10ae2b9b9900fd361bf264988261c Mon Sep 17 00:00:00 2001 From: Till Kamppeter Date: Wed, 15 Dec 2010 21:21:32 +0100 Subject: foomatic-filters 4.0.6-0ubuntu1 --- debian/patches/unhtmlify-segfault.patch | 56 --------------------------------- 1 file changed, 56 deletions(-) delete mode 100644 debian/patches/unhtmlify-segfault.patch (limited to 'debian/patches/unhtmlify-segfault.patch') diff --git a/debian/patches/unhtmlify-segfault.patch b/debian/patches/unhtmlify-segfault.patch deleted file mode 100644 index c30875d..0000000 --- a/debian/patches/unhtmlify-segfault.patch +++ /dev/null @@ -1,56 +0,0 @@ -=== modified file 'ChangeLog' ---- foomatic-filters/ChangeLog 2010-08-27 18:01:04 +0000 -+++ foomatic-filters/ChangeLog 2010-08-27 23:41:04 +0000 -@@ -1,5 +1,10 @@ - 2010-08-27 Till Kamppeter - -+ * options.c: Made sure that the unhtmlify() function does not write -+ the zero byte to mark the string end beyond the buffer. Also use a -+ much larger buffer for parsing "*FoomaticRIPOptionPrototype:" in -+ the PPD file (bug #515). -+ - * util.c: In strncpy_tochar() use the isempty() function to check - whether the input string is empty (bug #514). - - -=== modified file 'options.c' ---- foomatic-filters/options.c 2010-07-07 21:49:47 +0000 -+++ foomatic-filters/options.c 2010-08-27 23:41:04 +0000 -@@ -1088,8 +1088,9 @@ - const char *repl; - struct tm *t = localtime(&job->time); - char tmpstr[10]; -+ size_t s; - -- while (*psrc && pdest - dest < size) { -+ while (*psrc && pdest - dest < size - 1) { - - if (*psrc == '&') { - psrc++; -@@ -1154,8 +1155,12 @@ - } - - if (repl) { -- strncpy(pdest, repl, size - (pdest - dest)); -- pdest += strlen(repl); -+ s = size - (pdest - dest) - 1; -+ strncpy(pdest, repl, s); -+ if (s < strlen(repl)) -+ pdest += s; -+ else -+ pdest += strlen(repl); - psrc = strchr(psrc, ';') +1; - } - else { -@@ -1601,8 +1606,8 @@ - /* "*FoomaticRIPOptionPrototype