summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Hofmann <Johannes.Hofmann@gmx.de>2006-04-19 18:18:18 +0200
committerJohannes Hofmann <Johannes.Hofmann@gmx.de>2006-04-19 18:18:18 +0200
commit5d933b3eae3e5edf782f713ee7537d07fb6ba89e (patch)
tree19f3031c33f5b74954d32b7fab13571e82798720
parentc7e7eef32b7de7cf8b43899f1da0adeda967d41a (diff)
Fix DSC parsing of "%%Page:" lines.
This fixes a segfault reported by Morten Brix Pedersen.
-rw-r--r--src/PostscriptDSC.cxx18
1 files changed, 15 insertions, 3 deletions
diff --git a/src/PostscriptDSC.cxx b/src/PostscriptDSC.cxx
index b8b998a..345a32b 100644
--- a/src/PostscriptDSC.cxx
+++ b/src/PostscriptDSC.cxx
@@ -22,6 +22,7 @@
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
+#include <ctype.h>
#include "PostscriptDSC.H"
PostscriptDSC::PostscriptDSC() {
@@ -49,7 +50,7 @@ PostscriptDSC::parse(int fd) {
FILE *fp;
char linebuf[1024];
int x, y, w, h;
- int p1, p2, ps;
+ int p1 = 0, ps;
int i = 0;
int bb_read = 0;
@@ -93,7 +94,18 @@ PostscriptDSC::parse(int fd) {
page_len = (size_t*) malloc(sizeof(size_t) * pages);
memset(page_len, 0, sizeof(size_t) * pages);
- } else if (sscanf(linebuf, "%%%%Page: %d %d", &p1, &p2) == 2) {
+ } else if (strncmp(linebuf, "%%Page: ", strlen("%%Page: ")) == 0) {
+ char *p_str = &linebuf[strlen(linebuf)];
+
+ // move p_str back to beginning of last number in linebuf
+ while (p_str > linebuf && !isdigit(*p_str)) {
+ p_str--;
+ }
+ while (p_str > linebuf && isdigit(*p_str)) {
+ p_str--;
+ }
+
+ p1 = atoi(p_str);
if (!page_off || !page_len) {
fprintf(stderr, "Number of pages not defined\n");
@@ -120,7 +132,7 @@ PostscriptDSC::parse(int fd) {
}
}
- if (page_len && page_off) {
+ if (page_len && page_off && p1 > 0 && p1 <= pages) {
page_len[p1 - 1] = ftello(fp) - page_off[p1 - 1];
for (int i=0; i<pages; i++) {