summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorAkira Kakuto <kakuto@fuk.kindai.ac.jp>2020-01-22 15:30:12 +0000
committerAkira Kakuto <kakuto@fuk.kindai.ac.jp>2020-01-22 15:30:12 +0000
commit405ff9bb9c946abceb2c3ba9c000f0dd0163b720 (patch)
treebce6fafd7565814156f916ba462f3e7f4aa3a33a /Build
parentf5738dba24ffcaf94ddbac8a9b77f894c2c88069 (diff)
Correct wrong sizes of opassword and upassword
git-svn-id: svn://tug.org/texlive/trunk@53495 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/dvipdfm-x/ChangeLog5
-rw-r--r--Build/source/texk/dvipdfm-x/dvi.c18
2 files changed, 18 insertions, 5 deletions
diff --git a/Build/source/texk/dvipdfm-x/ChangeLog b/Build/source/texk/dvipdfm-x/ChangeLog
index 24b54c0a449..a2c29bcf013 100644
--- a/Build/source/texk/dvipdfm-x/ChangeLog
+++ b/Build/source/texk/dvipdfm-x/ChangeLog
@@ -1,3 +1,8 @@
+2020-01-22 Akira Kakuto <kakuto@w32tex.org>
+
+ * dvi.c: Correct wrong sizes of opassword and upassword
+ in scan_special_encrypt().
+
2020-01-16 Karl Berry <karl@freefriends.org>
* xbb.c (show_version),
diff --git a/Build/source/texk/dvipdfm-x/dvi.c b/Build/source/texk/dvipdfm-x/dvi.c
index 1fcc2e75f7d..95022024718 100644
--- a/Build/source/texk/dvipdfm-x/dvi.c
+++ b/Build/source/texk/dvipdfm-x/dvi.c
@@ -1,6 +1,6 @@
/* This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks.
- Copyright (C) 2002-2019 by Jin-Hwan Cho and Shunsaku Hirata,
+ Copyright (C) 2002-2020 by Jin-Hwan Cho and Shunsaku Hirata,
the dvipdfmx project team.
Copyright (C) 2012-2015 by Khaled Hosny <khaledhosny@eglug.org>
@@ -2259,6 +2259,8 @@ read_length (double *vp, double mag, const char **pp, const char *endptr)
return error;
}
+#include "pdfencrypt.h"
+
static int
scan_special_encrypt (int *key_bits, int32_t *permission, char *opassword, char *upassword,
const char **curptr, const char *endptr)
@@ -2279,15 +2281,21 @@ scan_special_encrypt (int *key_bits, int32_t *permission, char *opassword, char
skip_white(&p, endptr);
if (!strcmp(kp, "ownerpw")) {
if ((obj = parse_pdf_string(&p, endptr))) {
- if (pdf_string_value(obj))
- strncpy(opassword, pdf_string_value(obj), sizeof(opassword)-1);
+ if (pdf_string_value(obj)) {
+ int str_length = (MAX_PWD_LEN - 1 > pdf_string_length(obj)
+ ? pdf_string_length(obj) : MAX_PWD_LEN - 1);
+ strncpy(opassword, pdf_string_value(obj), str_length);
+ }
pdf_release_obj(obj);
} else
error = -1;
} else if (!strcmp(kp, "userpw")) {
if ((obj = parse_pdf_string(&p, endptr))) {
- if (pdf_string_value(obj))
- strncpy(upassword, pdf_string_value(obj), sizeof(upassword)-1);
+ if (pdf_string_value(obj)) {
+ int str_length = (MAX_PWD_LEN - 1 > pdf_string_length(obj)
+ ? pdf_string_length(obj) : MAX_PWD_LEN - 1);
+ strncpy(upassword, pdf_string_value(obj), str_length);
+ }
pdf_release_obj(obj);
} else
error = -1;