[GNUnet-SVN] r3356 - in Extractor/src/plugins: . pdf

[grothoff]

Author: grothoff
Date: 2006-09-05 16:07:07 -0700 (Tue, 05 Sep 2006)
New Revision: 3356

Modified:
   Extractor/src/plugins/pdf/PDFDoc.h
   Extractor/src/plugins/pdf/pdfextractor.cc
   Extractor/src/plugins/pdfextractor.c
Log:
fixing Mantis 1127 and 1130 (different PDF problems)

Modified: Extractor/src/plugins/pdf/PDFDoc.h
===================================================================
--- Extractor/src/plugins/pdf/PDFDoc.h  2006-09-05 23:00:14 UTC (rev 3355)
+++ Extractor/src/plugins/pdf/PDFDoc.h  2006-09-05 23:07:07 UTC (rev 3356)
@@ -138,8 +138,8 @@
   GBool isLinearized();
 
   // Return the document's Info dictionary (if any).
-  Object *getDocInfo(Object *obj) { return xref->getDocInfo(obj); }
-  Object *getDocInfoNF(Object *obj) { return xref->getDocInfoNF(obj); }
+  Object *getDocInfo(Object *obj) { return xref != NULL ? 
xref->getDocInfo(obj) : NULL; }
+  Object *getDocInfoNF(Object *obj) { return xref != NULL ? 
xref->getDocInfoNF(obj) : NULL; }
 
   // Return the PDF version specified by the file.
   double getPDFVersion() { return pdfVersion; }

Modified: Extractor/src/plugins/pdf/pdfextractor.cc
===================================================================
--- Extractor/src/plugins/pdf/pdfextractor.cc   2006-09-05 23:00:14 UTC (rev 
3355)
+++ Extractor/src/plugins/pdf/pdfextractor.cc   2006-09-05 23:07:07 UTC (rev 
3356)
@@ -233,8 +233,8 @@
     result = addKeyword(EXTRACTOR_MIMETYPE,
                        strdup("application/pdf"),
                        prev);
-    doc->getDocInfo(&info);
-    if (info.isDict()) {
+    if ( (NULL != doc->getDocInfo(&info)) &&
+        (info.isDict()) ) {
       result = printInfoString(info.getDict(),
                               "Title",
                               EXTRACTOR_TITLE,

Modified: Extractor/src/plugins/pdfextractor.c
===================================================================
--- Extractor/src/plugins/pdfextractor.c        2006-09-05 23:00:14 UTC (rev 
3355)
+++ Extractor/src/plugins/pdfextractor.c        2006-09-05 23:07:07 UTC (rev 
3356)
@@ -437,20 +437,25 @@
                      pos - spos);
        if (i == 0) {
          dmeta = dateDecode(meta);
-         mlen = strlen((const char*)dmeta);
+         if (dmeta != NULL)
+           mlen = strlen((const char*)dmeta);
+         else
+           mlen = 0;
        } else {
          dmeta = stringDecode(meta,
                               &mlen);
        }
        if (meta != NULL)
          free(meta);
-       meta = charsetDecode(dmeta, mlen);
-       if (dmeta != NULL)
-         free(dmeta);
-       if (meta != NULL) {
-         prev = addKeyword(tagmap[i].type,
-                           meta,
-                           prev);
+       if (dmeta != NULL) {
+         meta = charsetDecode(dmeta, mlen);
+         if (dmeta != NULL)
+           free(dmeta);
+         if (meta != NULL) {
+           prev = addKeyword(tagmap[i].type,
+                             meta,
+                             prev);
+         }
        }
        break;
       }