Blame SOURCES/ghostscript-cve-2020-16299.patch

0ab051
diff --git a/contrib/japanese/gdev10v.c b/contrib/japanese/gdev10v.c
0ab051
index 5c8b7fb..53da0ec 100644
0ab051
--- a/contrib/japanese/gdev10v.c
0ab051
+++ b/contrib/japanese/gdev10v.c
0ab051
@@ -73,8 +73,20 @@ gx_device_procs prn_bj10v_procs =
0ab051
   prn_matrix_procs(gdev_prn_open, bj10v_get_initial_matrix,
0ab051
     gdev_prn_output_page, gdev_prn_close);
0ab051
 #endif
0ab051
+
0ab051
+static int
0ab051
+bj10v_open(gx_device * pdev)
0ab051
+{
0ab051
+    if (pdev->HWResolution[0] < 180 ||
0ab051
+        pdev->HWResolution[1] < 180)
0ab051
+    {
0ab051
+        emprintf(pdev->memory, "device requires a resolution of at least 180dpi\n");
0ab051
+        return_error(gs_error_rangecheck);
0ab051
+    }
0ab051
+    return gdev_prn_open(pdev);
0ab051
+}
0ab051
 gx_device_procs prn_bj10v_procs =
0ab051
-  prn_procs(gdev_prn_open, gdev_prn_output_page, gdev_prn_close);
0ab051
+  prn_procs(bj10v_open, gdev_prn_output_page, gdev_prn_close);
0ab051
 
0ab051
 gx_device_printer gs_bj10v_device =
0ab051
   prn_device(prn_bj10v_procs, "bj10v",
0ab051
diff --git a/contrib/japanese/gdevalps.c b/contrib/japanese/gdevalps.c
0ab051
index f29aeb1..d4de619 100644
0ab051
--- a/contrib/japanese/gdevalps.c
0ab051
+++ b/contrib/japanese/gdevalps.c
0ab051
@@ -155,13 +155,20 @@ static const char end_md[] = {
0ab051
 static int
0ab051
 md_open(gx_device *pdev)
0ab051
 {
0ab051
-        static const float md_margins[4] =
0ab051
-         {	MD_SIDE_MARGIN, MD_BOTTOM_MARGIN,
0ab051
-                MD_SIDE_MARGIN, MD_TOP_MARGIN
0ab051
-         };
0ab051
-
0ab051
-        gx_device_set_margins(pdev, md_margins, true);
0ab051
-        return gdev_prn_open(pdev);
0ab051
+  static const float md_margins[4] =
0ab051
+    {
0ab051
+        MD_SIDE_MARGIN, MD_BOTTOM_MARGIN,
0ab051
+        MD_SIDE_MARGIN, MD_TOP_MARGIN
0ab051
+    };
0ab051
+
0ab051
+    if (pdev->HWResolution[0] != 600)
0ab051
+    {
0ab051
+        emprintf(pdev->memory, "device must have an X resolution of 600dpi\n");
0ab051
+        return_error(gs_error_rangecheck);
0ab051
+    }
0ab051
+
0ab051
+    gx_device_set_margins(pdev, md_margins, true);
0ab051
+    return gdev_prn_open(pdev);
0ab051
 }
0ab051
 
0ab051
 /* MD5000 monochrome mode entrance. */