summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorRobin Watts <robin.watts@artifex.com>2013-10-16 14:49:05 +0100
committerRobin Watts <robin.watts@artifex.com>2013-10-16 15:45:38 +0100
commitdebdd26de8759321dc1650593477f1a83565565b (patch)
treedeb27ebe620c4b5bb0540cb6bea5b360aeb9211a /source
parent63e00ddd93bf6dd15e8d65d40bc719c3bf59fd0b (diff)
downloadmupdf-debdd26de8759321dc1650593477f1a83565565b.tar.xz
Fix cross document store object hash collisions.
When putting store objects into the store, ensure that they do cannot collide across documents.
Diffstat (limited to 'source')
-rw-r--r--source/pdf/pdf-font.c1
-rw-r--r--source/pdf/pdf-store.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/source/pdf/pdf-font.c b/source/pdf/pdf-font.c
index f79a0769..e0664b13 100644
--- a/source/pdf/pdf-font.c
+++ b/source/pdf/pdf-font.c
@@ -765,6 +765,7 @@ hail_mary_make_hash_key(fz_store_hash *hash, void *key_)
{
hash->u.i.i0 = 0;
hash->u.i.i1 = 0;
+ hash->u.i.ptr = NULL;
return 1;
}
diff --git a/source/pdf/pdf-store.c b/source/pdf/pdf-store.c
index d3873e76..dfb2f54c 100644
--- a/source/pdf/pdf-store.c
+++ b/source/pdf/pdf-store.c
@@ -9,6 +9,7 @@ pdf_make_hash_key(fz_store_hash *hash, void *key_)
return 0;
hash->u.i.i0 = pdf_to_num(key);
hash->u.i.i1 = pdf_to_gen(key);
+ hash->u.i.ptr = pdf_get_indirect_document(key);
return 1;
}