@@ -2396,8 +2396,10 @@ void pdf_parseobj(struct pdf_struct *pdf, struct pdf_obj *obj)

                 objid = objid << 8;

-                while (isdigit(*q2))

+                while ((dict_remaining > 0) && isdigit(*q2)) {

                     q2++;

+                    dict_remaining--;

+                }

                 q2_old = q2;

                 q2 = pdf_nextobject(q2, dict_remaining);

@@ -3640,6 +3642,11 @@ done:

 static const char *

 pdf_nextlinestart(const char *ptr, size_t len)

 {

+    if (!ptr || (0 == len)) {

+        /* Invalid args */

+        return NULL;

+    }

+

     while(strchr("\r\n", *ptr) == NULL) {

         if(--len == 0L)

             return NULL;