@@ -2408,6 +2408,10 @@ int cli_pdf(const char *dir, cli_ctx *ctx, off_t offset)

     if (q <= eofmap) {

         pdf.flags |= 1 << BAD_PDF_TRAILER;

         cli_dbgmsg("cli_pdf: %%%%EOF not found\n");

+#if HAVE_JSON

+        if (pdfobj)

+            cli_jsonbool(pdfobj, "NoEOF", 1);

+#endif

     } else {

         const char *t;

@@ -2421,6 +2425,10 @@ int cli_pdf(const char *dir, cli_ctx *ctx, off_t offset)

         if (q <= eofmap) {

             pdf.flags |= 1 << BAD_PDF_TRAILER;

             cli_dbgmsg("cli_pdf: startxref not found\n");

+#if HAVE_JSON

+            if (pdfobj)

+                cli_jsonbool(pdfobj, "NoXREF", 1);

+#endif

         } else {

             for (t=q;t > eofmap; t--) {

                 if (memcmp(t,"trailer",7) == 0)

@@ -3067,8 +3075,6 @@ static void Pages_cb(struct pdf_struct *pdf, struct pdf_obj *obj, struct pdfname

     dict = pdf_parse_dict(pdf, obj, objsz, begin, NULL);

     if (dict) {

-        cli_errmsg("==== ==== ==== ====\n");

-        pdf_print_dict(dict, 0);

         pdf_free_dict(dict);

     }

@@ -3193,6 +3199,7 @@ static void pdf_export_json(struct pdf_struct *pdf)

 {

 #if HAVE_JSON

     json_object *pdfobj;

+    unsigned long i;

     if (!(pdf))

         return;

@@ -3284,6 +3291,18 @@ static void pdf_export_json(struct pdf_struct *pdf)

             cli_jsonbool(pdfobj, "Decryptable", 1);

     }

+    for (i=0; i < pdf->nobjs; i++) {

+        if (pdf->objs[i].flags & (1<<OBJ_TRUNCATED)) {

+            json_object *truncobj;

+

+            truncobj = cli_jsonarray(pdfobj, "TruncatedObjects");

+            if (!(truncobj))

+                continue;

+

+            cli_jsonint_array(truncobj, pdf->objs[i].id>>8);

+        }

+    }

+

 cleanup:

     if ((pdf->stats.author)) {

         free(pdf->stats.author);

@@ -204,6 +204,7 @@ int is_object_reference(char *begin, char **endchar, uint32_t *id)

     t |= (n&0xff);

+    /* Skip even more whitespace */

     p1 = p2;

     while (p1 < end && isspace(p1[0]))

         p1++;

@@ -268,7 +269,12 @@ char *pdf_parse_string(struct pdf_struct *pdf, struct pdf_obj *obj, const char *

     if ((p1 - q) == objsize)

         return NULL;

-    /* We should be at the start of the string, minus 1 */

+    /*

+     * If str is non-null:

+     *     We should be at the start of the string, minus 1

+     * Else:

+     *     We should be at the start of the string

+     */

     p2 = q + objsize;

     if (is_object_reference(p1, &p2, &objid)) {