diff options
| author | Robin Watts <robin.watts@artifex.com> | 2013-09-13 15:47:58 +0100 |
|---|---|---|
| committer | Robin Watts <robin.watts@artifex.com> | 2013-09-13 16:02:32 +0100 |
| commit | aefe6a511b3cb901034e5995fd882e334e40f2bb (patch) | |
| tree | 74005b19d77e704480b2c7c43c3ed51c15b17dcf /source/pdf/pdf-crypt.c | |
| parent | a0a92b5cf0fa076c923e7a5aa911dfff28aea351 (diff) | |
| download | mupdf-aefe6a511b3cb901034e5995fd882e334e40f2bb.tar.xz | |
Fix various compile warnings spotted by the cluster.
Diffstat (limited to 'source/pdf/pdf-crypt.c')
| -rw-r--r-- | source/pdf/pdf-crypt.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/pdf/pdf-crypt.c b/source/pdf/pdf-crypt.c index c1a4a52c..850ab942 100644 --- a/source/pdf/pdf-crypt.c +++ b/source/pdf/pdf-crypt.c @@ -477,7 +477,8 @@ pdf_compute_hardened_hash_r6(fz_context *ctx, unsigned char *password, int pwlen /* Step 2: repeat password and data block 64 times */ memcpy(data, password, pwlen); memcpy(data + pwlen, block, block_size); - memcpy(data + pwlen + block_size, ownerkey, ownerkey ? 48 : 0); + if (ownerkey) + memcpy(data + pwlen + block_size, ownerkey, 48); data_len = pwlen + block_size + (ownerkey ? 48 : 0); for (j = 1; j < 64; j++) memcpy(data + j * data_len, data, data_len); |