Fix a crash bug with a bad title image (Issue #510)

michaelrsweet · Sep 13, 2023 · 07c63af · 07c63af
1 parent 8eb9d42
commit 07c63af
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 14 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -3,6 +3,7 @@
 - Now link to CUPS library instead of embedding its HTTP code.
 - Fixed multiple conversions of UTF-8 HTML files from the GUI (Issue #496)
 - Fixed some minor CodeQL warnings.
+- Fixed a crash bug with bad title images (Issue #510)
 
 
 # Changes in HTMLDOC v1.9.16

diff --git a/htmldoc/html.cxx b/htmldoc/html.cxx
@@ -495,16 +495,19 @@ write_title(FILE  *out,		/* I - Output file */
     {
       image_t *img = image_load(TitleImage, !OutputColor);
 
-      if (OutputFiles)
-	fprintf(out, "<IMG SRC=\"%s\" BORDER=\"0\" WIDTH=\"%d\" HEIGHT=\"%d\" "
-	             "ALT=\"%s\"><BR>\n",
-        	file_basename((char *)TitleImage), img->width, img->height,
-		title ? (char *)title : "");
-      else
-	fprintf(out, "<IMG SRC=\"%s\" BORDER=\"0\" WIDTH=\"%d\" HEIGHT=\"%d\" "
-	             "ALT=\"%s\"><BR>\n",
-        	TitleImage, img->width, img->height,
-		title ? (char *)title : "");
+      if (img)
+      {
+	if (OutputFiles)
+	  fprintf(out, "<IMG SRC=\"%s\" BORDER=\"0\" WIDTH=\"%d\" HEIGHT=\"%d\" "
+		       "ALT=\"%s\"><BR>\n",
+		  file_basename((char *)TitleImage), img->width, img->height,
+		  title ? (char *)title : "");
+	else
+	  fprintf(out, "<IMG SRC=\"%s\" BORDER=\"0\" WIDTH=\"%d\" HEIGHT=\"%d\" "
+		       "ALT=\"%s\"><BR>\n",
+		  TitleImage, img->width, img->height,
+		  title ? (char *)title : "");
+      }
     }
 
     if (title != NULL)

diff --git a/htmldoc/htmlsep.cxx b/htmldoc/htmlsep.cxx
@@ -455,10 +455,11 @@ write_title(FILE  *out,		/* I - Output file */
     {
       image_t *img = image_load(TitleImage, !OutputColor);
 
-      fprintf(out, "<IMG SRC=\"%s\" WIDTH=\"%d\" HEIGHT=\"%d\" "
-	           "ALT=\"%s\"><BR>\n",
-              file_basename((char *)TitleImage), img->width, img->height,
-	      title ? (char *)title : "");
+      if (img)
+	fprintf(out, "<IMG SRC=\"%s\" WIDTH=\"%d\" HEIGHT=\"%d\" "
+		     "ALT=\"%s\"><BR>\n",
+		file_basename((char *)TitleImage), img->width, img->height,
+		title ? (char *)title : "");
     }
 
     if (title != NULL)