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

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