check that strcmp args are non-null

git-svn-id: svn://tug.org/texlive/trunk/Build/source@70406 c570f23f-e606-0410-a88d-b1316a301751
TeX-Live · Mar 4, 2024 · 66f7636 · 66f7636
1 parent dacdb3a
commit 66f7636
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/texk/dvipdfm-x/ChangeLog b/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/texk/dvipdfm-x/pdfximage.c b/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;