protect against broken info dictionaries

[swftools.git] / lib / pdf / pdf.cc

diff --git a/lib/pdf/pdf.cc b/lib/pdf/pdf.cc
index b446923..4bcf9b9 100644 (file)
--- a/lib/pdf/pdf.cc
+++ b/lib/pdf/pdf.cc
@@ -137,7 +137,7 @@ void pdf_doc_destroy(gfxdocument_t*gfx)
     }
 }
 
-void pdf_doc_set_parameter(gfxdocument_t*gfx, char*name, char*value)
+void pdf_doc_set_parameter(gfxdocument_t*gfx, const char*name, const char*value)
 {
     pdf_doc_internal_t*i= (pdf_doc_internal_t*)gfx->internal;
     GFXOutputDev*o = i->outputDev;
@@ -179,7 +179,7 @@ static char*getInfoString(Dict *infoDict, char *key)
     GString *s1, *s2;
     int i;
 
-    if (infoDict->lookup(key, &obj)->isString()) {
+    if (infoDict && infoDict->lookup(key, &obj)->isString()) {
        s1 = obj.getString();
        if ((s1->getChar(0) & 0xff) == 0xfe &&
            (s1->getChar(1) & 0xff) == 0xff) {
@@ -211,7 +211,7 @@ static char*getInfoDate(Dict *infoDict, char *key)
     Object obj;
     char *s;
 
-    if (infoDict->lookup(key, &obj)->isString()) {
+    if (infoDict && infoDict->lookup(key, &obj)->isString()) {
        s = obj.getString()->getCString();
        if (s[0] == 'D' && s[1] == ':') {
          s += 2;
@@ -223,7 +223,7 @@ static char*getInfoDate(Dict *infoDict, char *key)
     return strdup("");
 }
 
-char* pdf_doc_getinfo(gfxdocument_t*doc, char*name)
+char* pdf_doc_getinfo(gfxdocument_t*doc, const char*name)
 {
     pdf_doc_internal_t*i= (pdf_doc_internal_t*)doc->internal;
     if(!strcmp(name, "title")) return getInfoString(i->docinfo.getDict(), "Title");
@@ -250,7 +250,7 @@ char* pdf_doc_getinfo(gfxdocument_t*doc, char*name)
 }
 
 
-void storeDeviceParameter(char*name, char*value)
+static void storeDeviceParameter(const char*name, const char*value)
 {
     parameter_t*p = new parameter_t();
     p->name = strdup(name);
@@ -265,7 +265,7 @@ void storeDeviceParameter(char*name, char*value)
     }
 }
 
-void pdf_set_parameter(char*name, char*value)
+static void pdf_set_parameter(const char*name, const char*value)
 {
     msg("<verbose> setting parameter %s to \"%s\"", name, value);
     if(!strncmp(name, "fontdir", strlen("fontdir"))) {
@@ -298,7 +298,7 @@ void pdf_set_parameter(char*name, char*value)
     }
 }
 
-gfxdocument_t*pdf_open(char*filename)
+static gfxdocument_t*pdf_open(const char*filename)
 {
     gfxdocument_t*pdf_doc = (gfxdocument_t*)malloc(sizeof(gfxdocument_t));
     memset(pdf_doc, 0, sizeof(gfxdocument_t));
@@ -351,7 +351,7 @@ gfxdocument_t*pdf_open(char*filename)
               i->protect = 1;
     }
 
-    InfoOutputDev*io = new InfoOutputDev();
+    InfoOutputDev*io = new InfoOutputDev(i->doc->getXRef());
     int t;
     i->pages = (pdf_page_info_t*)malloc(sizeof(pdf_page_info_t)*pdf_doc->num_pages);
     memset(i->pages,0,sizeof(pdf_page_info_t)*pdf_doc->num_pages);