aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authoryzrh <yzrh@noema.org>2023-01-05 11:21:54 +0000
committeryzrh <yzrh@noema.org>2023-01-05 11:21:54 +0000
commit13cb0a1b8dd7cdee9af519dab10d6b1c1036c321 (patch)
tree5ef12e44ba21adce36d6c19172737def654ec8f0 /src
parenta7ecc156141b15cfae8b309697e12deae2740841 (diff)
downloadmelon-13cb0a1b8dd7cdee9af519dab10d6b1c1036c321.tar.gz
melon-13cb0a1b8dd7cdee9af519dab10d6b1c1036c321.tar.zst
Fix invalid token parsing.
Signed-off-by: yzrh <yzrh@noema.org>
Diffstat (limited to 'src')
-rw-r--r--src/pdf_parser.c47
1 files changed, 25 insertions, 22 deletions
diff --git a/src/pdf_parser.c b/src/pdf_parser.c
index 6520fd5..e6d8ac6 100644
--- a/src/pdf_parser.c
+++ b/src/pdf_parser.c
@@ -228,28 +228,31 @@ pdf_load(pdf_object_t **pdf, FILE **fp, int size_buf)
((tail = _memmem_whitespace(buf, ptr->size, ">>", 2)) != NULL ||
/* Hack needed for invalid object */
(tail = memmem(buf, ptr->size, ">>", 2)) != NULL)) {
- /*
- * A dictionary object may have nested dictionary,
- * but it should not be in a stream
- */
- while (ptr->size - (tail - buf) > 3 &&
- (tmp = _memmem_whitespace(tail + 3,
- ptr->size - (tail - buf) - 3,
- ">>", 2)) != NULL &&
- memmem(tail + 3,
- (tmp - tail) - 3,
- "stream\r\n", 8) == NULL)
- tail = tmp;
-
- /* Hack needed for invalid object */
- while (ptr->size - (tail - buf) > 2 &&
- (tmp = memmem(tail + 2,
- ptr->size - (tail - buf) - 2,
- ">>", 2)) != NULL &&
- memmem(tail + 2,
- (tmp - tail) - 2,
- "stream\r\n", 8) == NULL)
- tail = tmp;
+ if (memmem(buf, tail - buf, "stream\r\n", 8) != NULL) {
+ tail = memmem(buf, ptr->size, ">>", 2);
+
+ while (ptr->size - (tail - buf) > 2 &&
+ (tmp = memmem(tail + 2,
+ ptr->size - (tail - buf) - 2,
+ ">>", 2)) != NULL &&
+ memmem(tail + 2,
+ (tmp - tail) - 2,
+ "stream\r\n", 8) == NULL)
+ tail = tmp;
+ } else {
+ /*
+ * A dictionary object may have nested dictionary,
+ * but it should not be in a stream
+ */
+ while (ptr->size - (tail - buf) > 3 &&
+ (tmp = _memmem_whitespace(tail + 3,
+ ptr->size - (tail - buf) - 3,
+ ">>", 2)) != NULL &&
+ memmem(tail + 3,
+ (tmp - tail) - 3,
+ "stream\r\n", 8) == NULL)
+ tail = tmp;
+ }
ptr->dictionary_size = tail - head + 2;
ptr->dictionary = malloc(ptr->dictionary_size + 1);