diff options
| author | Didier Raboud <didier@raboud.com> | 2010-05-23 00:08:54 +0200 |
|---|---|---|
| committer | Didier Raboud <didier@raboud.com> | 2010-05-23 00:08:54 +0200 |
| commit | dc5b0044ec89ff1242eef765f2931354d140149b (patch) | |
| tree | 686e6e034dbc8981fd4fcf908d01b08f50a732ae | |
| parent | 22eb66defb3c4b4edc572c258e2b4ba3882075c0 (diff) | |
| parent | 28b11afe093d8a0ed71bdeeffcd3c9f2bd663e15 (diff) | |
Merge branch 'upstream'
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | VERSION.full | 2 | ||||
| -rw-r--r-- | foomaticrip.c | 2 |
3 files changed, 13 insertions, 2 deletions
@@ -1,3 +1,14 @@ +2009-03-07 Till Kamppeter <till.kamppeter@gmail.com> + + * foomatic-rip.1.in: Fixed typos. + + * renderer.c: When doing the massaging of the remderer command line + foomatic-rip inserts 'gs' at the wrong place in command lines of + 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). + 2009-02-11 Lars Uebernickel <larsuebernickel@gmx.de> * foomaticrip.c: The value of the "execpath" variable in the config file was not used fully: Only the characters leading up to the first diff --git a/VERSION.full b/VERSION.full index ff2ce95..c103a43 100644 --- a/VERSION.full +++ b/VERSION.full @@ -1 +1 @@ -4.0.0.200 +4.0.0.201 diff --git a/foomaticrip.c b/foomaticrip.c index 37d0822..2db5cb8 100644 --- a/foomaticrip.c +++ b/foomaticrip.c @@ -937,7 +937,7 @@ int print_file(const char *filename, int convert) } } - n = fread(buf, 1, sizeof(buf), file); + n = fread(buf, 1, sizeof(buf) - 1, file); buf[n] = '\0'; type = guess_file_type(buf, n, &startpos); if (startpos > 0) { |