summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Build/source/texk/dvipdfm-x/ChangeLog6
-rw-r--r--Build/source/texk/dvipdfm-x/pdfximage.c3
2 files changed, 8 insertions, 1 deletions
diff --git a/Build/source/texk/dvipdfm-x/ChangeLog b/Build/source/texk/dvipdfm-x/ChangeLog
index f0e073ceee3..d3965e24b01 100644
--- a/Build/source/texk/dvipdfm-x/ChangeLog
+++ b/Build/source/texk/dvipdfm-x/ChangeLog
@@ -1,3 +1,9 @@
+2024-03-05 Max Chernoff <mseven@telus.net>
+
+ * pdfximage.c (pdf_ximage_load_image): check that strcmp args
+ are not non-null. Report from Hartmut Henkel,
+ https://tug.org/pipermail/tex-live/2024-March/050136.html
+
2024-02-25 Max Chernoff <mseven@telus.net>
* spc_util.{c,h}: Add "named" keyword to "pdf:image" special
diff --git a/Build/source/texk/dvipdfm-x/pdfximage.c b/Build/source/texk/dvipdfm-x/pdfximage.c
index 016583fdd56..275f6777b5b 100644
--- a/Build/source/texk/dvipdfm-x/pdfximage.c
+++ b/Build/source/texk/dvipdfm-x/pdfximage.c
@@ -415,7 +415,8 @@ pdf_ximage_load_image (const char *ident, const char *filename, load_options opt
}
if (id >= 0) {
if (I->attr.page_no == options.page_no &&
- strcmp(I->attr.page_name, options.page_name) == 0 &&
+ (I->attr.page_name && options.page_name &&
+ strcmp(I->attr.page_name, options.page_name) == 0) &&
!pdf_compare_object(I->attr.dict, options.dict) && /* ????? */
I->attr.bbox_type == options.bbox_type) {
return id;