Merge pull request #12169 from rouault/fix_ossfuzz_411459952

HFA and PDF: avoid integer division by zero in CreateCopy() when one of dataset dimension is zero

Author: rouault

autotest/gcore/hfa_write.py

@@ -28,11 +28,13 @@
 # test that we can write a small file with a custom layer name.
 
 
-def test_hfa_write_desc():
+def test_hfa_write_desc(tmp_path):
+
+    img_path = tmp_path / "test_desc.img"
 
     src_ds = gdal.Open("data/byte.tif")
 
-    new_ds = gdal.GetDriverByName("HFA").CreateCopy("tmp/test_desc.img", src_ds)
+    new_ds = gdal.GetDriverByName("HFA").CreateCopy(img_path, src_ds)
 
     bnd = new_ds.GetRasterBand(1)
     bnd.SetDescription("CustomBandName")
@@ -41,88 +43,69 @@ def test_hfa_write_desc():
     src_ds = None
     new_ds = None
 
-    new_ds = gdal.Open("tmp/test_desc.img")
+    new_ds = gdal.Open(img_path)
     bnd = new_ds.GetRasterBand(1)
     assert bnd.GetDescription() == "CustomBandName", "Didn't get custom band name."
 
-    bnd = None
-    new_ds = None
-
-    gdal.GetDriverByName("HFA").Delete("tmp/test_desc.img")
-
 
 ###############################################################################
-# test writing 4 bit files.
-
-
-def test_hfa_write_4bit():
-    drv = gdal.GetDriverByName("HFA")
-    src_ds = gdal.Open("data/byte.tif")
-    ds = drv.CreateCopy("tmp/4bit.img", src_ds, options=["NBITS=1"])
-    ds = None
-    src_ds = None
-
-    ds = gdal.Open("tmp/4bit.img")
-    cs = ds.GetRasterBand(1).Checksum()
+# test writing n-bit files.
 
-    assert cs == 252, "Got wrong checksum on 4bit image."
 
-    ds = None
-
-    drv.Delete("tmp/4bit.img")
-
-
-###############################################################################
-# test writing 4 bit files compressed.
+@pytest.mark.parametrize(
+    "options,expected_cs",
+    [
+        (["NBITS=1"], 252),
+        (["NBITS=1", "COMPRESSED=YES"], 252),
+        (["NBITS=2"], 718),
+        (["NBITS=2", "COMPRESSED=YES"], 718),
+        (["NBITS=4"], 2578),
+        (["NBITS=4", "COMPRESSED=YES"], 2578),
+    ],
+)
+def test_hfa_write_nbits(tmp_path, options, expected_cs):
 
+    img_path = tmp_path / "nbits.img"
 
-def test_hfa_write_4bit_compressed():
     drv = gdal.GetDriverByName("HFA")
     src_ds = gdal.Open("data/byte.tif")
-    ds = drv.CreateCopy("tmp/4bitc.img", src_ds, options=["NBITS=1", "COMPRESSED=YES"])
+    ds = drv.CreateCopy(img_path, src_ds, options=options)
     ds = None
     src_ds = None
 
-    ds = gdal.Open("tmp/4bitc.img")
+    ds = gdal.Open(img_path)
     cs = ds.GetRasterBand(1).Checksum()
-
-    assert cs == 252, "Got wrong checksum on 4bit image."
-
-    ds = None
-
-    drv.Delete("tmp/4bitc.img")
+    assert cs == expected_cs
 
 
 ###############################################################################
 # Test creating a file with a nodata value, and fetching otherwise unread
 # blocks and verifying they are the nodata value.  (#2427)
 
 
-def test_hfa_write_nd_invalid():
+def test_hfa_write_nd_invalid(tmp_path):
+
+    img_path = tmp_path / "ndinvalid.img"
 
     drv = gdal.GetDriverByName("HFA")
-    ds = drv.Create("tmp/ndinvalid.img", 512, 512, 1, gdal.GDT_Byte, [])
+    ds = drv.Create(img_path, 512, 512, 1, gdal.GDT_Byte, [])
     ds.GetRasterBand(1).SetNoDataValue(200)
     ds = None
 
-    ds = gdal.Open("tmp/ndinvalid.img")
+    ds = gdal.Open(img_path)
     cs = ds.GetRasterBand(1).Checksum()
 
     assert cs == 29754, "Got wrong checksum on invalid image."
 
-    ds = None
-
-    drv.Delete("tmp/ndinvalid.img")
-
 
 ###############################################################################
 # Test updating .rrd overviews in place (#2524).
 
 
 def test_hfa_update_overviews(tmp_path):
 
-    img_path = str(tmp_path / "small.img")
-    rrd_path = str(tmp_path / "small.rrd")
+    img_path = tmp_path / "small.img"
+    rrd_path = tmp_path / "small.rrd"
 
     shutil.copyfile("data/small_ov.img", img_path)
     shutil.copyfile("data/small_ov.rrd", rrd_path)
@@ -131,7 +114,6 @@ def test_hfa_update_overviews(tmp_path):
     result = ds.BuildOverviews(overviewlist=[2])
 
     assert result == 0, "BuildOverviews() failed."
-    ds = None
 
 
 ###############################################################################
@@ -140,8 +122,8 @@ def test_hfa_update_overviews(tmp_path):
 
 def test_hfa_clean_external_overviews(tmp_path):
 
-    img_path = str(tmp_path / "small.img")
-    rrd_path = str(tmp_path / "small.rrd")
+    img_path = tmp_path / "small.img"
+    rrd_path = tmp_path / "small.rrd"
 
     shutil.copyfile("data/small_ov.img", img_path)
     shutil.copyfile("data/small_ov.rrd", rrd_path)
@@ -160,17 +142,18 @@ def test_hfa_clean_external_overviews(tmp_path):
 
     assert not os.path.exists(rrd_path)
 
-    gdal.GetDriverByName("HFA").Delete(img_path)
-
 
 ###############################################################################
 # Test writing high frequency data (#2525).
 
 
-def test_hfa_bug_2525():
+def test_hfa_bug_2525(tmp_path):
+
+    tmp_filename = tmp_path / "test_hfa"
+
     drv = gdal.GetDriverByName("HFA")
     ds = drv.Create(
-        "tmp/test_hfa.img", 64, 64, 1, gdal.GDT_UInt16, options=["COMPRESSED=YES"]
+        tmp_filename, 64, 64, 1, gdal.GDT_UInt16, options=["COMPRESSED=YES"]
     )
     import struct
 
@@ -243,40 +226,33 @@ def test_hfa_bug_2525():
     )
     for i in range(64):
         ds.GetRasterBand(1).WriteRaster(0, i, 64, 1, data)
-    ds = None
-
-    drv.Delete("tmp/test_hfa.img")
+    ds.Close()
 
 
 ###############################################################################
 # Test building external overviews with HFA_USE_RRD=YES
 
 
-def test_hfa_use_rrd():
+def test_hfa_use_rrd(tmp_path):
+
+    tmp_filename = tmp_path / "small.img"
 
-    shutil.copyfile("data/small_ov.img", "tmp/small.img")
+    shutil.copyfile("data/small_ov.img", tmp_filename)
 
     with gdal.config_option("HFA_USE_RRD", "YES"):
-        ds = gdal.Open("tmp/small.img", gdal.GA_Update)
+        ds = gdal.Open(tmp_filename, gdal.GA_Update)
         result = ds.BuildOverviews(overviewlist=[2])
 
     assert result == 0, "BuildOverviews() failed."
     ds = None
 
-    try:
-        os.stat("tmp/small.rrd")
-    except OSError:
-        pytest.fail("small.rrd not present.")
+    assert os.path.exists(tmp_path / "small.rrd")
 
-    ds = gdal.Open("tmp/small.img")
+    ds = gdal.Open(tmp_filename)
     assert (
         ds.GetRasterBand(1).GetOverview(0).Checksum() == 26148
     ), "Unexpected checksum."
 
-    ds = None
-
-    gdal.GetDriverByName("HFA").Delete("tmp/small.img")
-
 
 ###############################################################################
 # Test fix for #4831
@@ -285,7 +261,7 @@ def test_hfa_use_rrd():
 @pytest.mark.require_driver("BMP")
 def test_hfa_update_existing_aux_overviews(tmp_path):
 
-    tmp_filename = str(tmp_path / "hfa_update_existing_aux_overviews.bmp")
+    tmp_filename = tmp_path / "hfa_update_existing_aux_overviews.bmp"
 
     with gdal.config_option("USE_RRD", "YES"):
 
@@ -351,8 +327,6 @@ def test_hfa_update_existing_aux_overviews(tmp_path):
             pytest.fail()
         ds = None
 
-        gdal.GetDriverByName("BMP").Delete(tmp_filename)
-
 
 ###############################################################################
 # Get the driver, and verify a few things about it.
@@ -436,25 +410,22 @@ def test_hfa_create_compress(filename, checksum, testfunction):
     getattr(ut, testfunction)()
 
 
-def test_hfa_create_compress_big_block():
-    src_ds = gdal.GetDriverByName("MEM").Create(
-        "/vsimem/big_block.img", 128, 128, 1, gdal.GDT_UInt32
-    )
+def test_hfa_create_compress_big_block(tmp_vsimem):
+    filename = tmp_vsimem / "test.img"
+    src_ds = gdal.GetDriverByName("MEM").Create("", 128, 128, 1, gdal.GDT_UInt32)
     src_ds.GetRasterBand(1).Fill(4 * 1000 * 1000 * 1000)
     src_ds.GetRasterBand(1).WriteRaster(0, 0, 1, 1, struct.pack("I", 0))
     gdal.GetDriverByName("HFA").CreateCopy(
-        "/vsimem/big_block.img", src_ds, options=["COMPRESS=YES", "BLOCKSIZE=128"]
+        filename, src_ds, options=["COMPRESS=YES", "BLOCKSIZE=128"]
     )
-    ds = gdal.Open("/vsimem/big_block.img")
+    ds = gdal.Open(filename)
     got_data = ds.GetRasterBand(1).ReadRaster()
-    ds = None
-    gdal.Unlink("/vsimem/big_block.img")
     assert got_data == src_ds.GetRasterBand(1).ReadRaster()
 
 
 # GCPs go to PAM currently
-def test_hfa_create_gcp():
-    filename = "/vsimem/test.img"
+def test_hfa_create_gcp(tmp_vsimem):
+    filename = tmp_vsimem / "test.img"
     ds = gdal.GetDriverByName("HFA").Create(filename, 1, 1)
     gcp1 = gdal.GCP()
     gcp1.GCPPixel = 0
@@ -465,9 +436,15 @@ def test_hfa_create_gcp():
     sr.ImportFromEPSG(4326)
     assert ds.SetGCPs((gcp1,), sr.ExportToWkt()) == gdal.CE_None
     ds = None
-    ds = gdal.Open(filename)
-    assert ds.GetGCPCount() == 1
-    assert ds.GetGCPSpatialRef() is not None
-    assert len(ds.GetGCPs()) == 1
-    ds = None
-    gdal.GetDriverByName("HFA").Delete(filename)
+
+    with gdal.Open(filename) as ds:
+        assert ds.GetGCPCount() == 1
+        assert ds.GetGCPSpatialRef() is not None
+        assert len(ds.GetGCPs()) == 1
+
+
+@pytest.mark.require_driver("L1B")
+def test_hfa_create_copy_from_ysize_0(tmp_vsimem):
+    src_ds = gdal.Open("../gdrivers/data/l1b/n12gac8bit_truncated_ysize_0_1band.l1b")
+    with pytest.raises(Exception, match="nXSize == 0 || nYSize == 0 not supported"):
+        gdal.GetDriverByName("HFA").CreateCopy(tmp_vsimem / "out.img", src_ds)

autotest/gdrivers/data/l1b/n12gac8bit_truncated_ysize_0_1band.l1b

@@ -3140,3 +3140,15 @@ def test_pdf_gdal_driver_pdf_list_layer():
     alg["input"] = "data/byte.tif"
     with pytest.raises(Exception, match="is not a PDF"):
         alg.Run()
+
+
+###############################################################################
+#
+
+
+@gdaltest.enable_exceptions()
+@pytest.mark.require_driver("L1B")
+def test_pdf_create_copy_from_ysize_0(tmp_vsimem):
+    src_ds = gdal.Open("../gdrivers/data/l1b/n12gac8bit_truncated_ysize_0_1band.l1b")
+    with pytest.raises(Exception, match="nWidth == 0 || nHeight == 0 not supported"):
+        gdal.GetDriverByName("PDF").CreateCopy(tmp_vsimem / "out.pdf", src_ds)

autotest/gdrivers/pdf.py

@@ -2227,6 +2227,12 @@ HFAHandle HFACreate(const char *pszFilename, int nXSize, int nYSize, int nBands,
                     EPTType eDataType, char **papszOptions)
 
 {
+    if (nXSize == 0 || nYSize == 0)
+    {
+        CPLError(CE_Failure, CPLE_NotSupported,
+                 "nXSize == 0 || nYSize == 0 not supported");
+        return nullptr;
+    }
     int nBlockSize = 64;
     const char *pszValue = CSLFetchNameValue(papszOptions, "BLOCKSIZE");
 

frmts/hfa/hfaopen.cpp

@@ -4150,16 +4150,20 @@ GDALDataset *GDALPDFCreateCopy(const char *pszFilename, GDALDataset *poSrcDS,
                                GDALProgressFunc pfnProgress,
                                void *pProgressData)
 {
-    int nBands = poSrcDS->GetRasterCount();
-    int nWidth = poSrcDS->GetRasterXSize();
-    int nHeight = poSrcDS->GetRasterYSize();
-
-    if (!pfnProgress(0.0, nullptr, pProgressData))
-        return nullptr;
+    const int nBands = poSrcDS->GetRasterCount();
+    const int nWidth = poSrcDS->GetRasterXSize();
+    const int nHeight = poSrcDS->GetRasterYSize();
 
     /* -------------------------------------------------------------------- */
     /*      Some some rudimentary checks                                    */
     /* -------------------------------------------------------------------- */
+    if (nWidth == 0 || nHeight == 0)
+    {
+        CPLError(CE_Failure, CPLE_NotSupported,
+                 "nWidth == 0 || nHeight == 0 not supported");
+        return nullptr;
+    }
+
     if (nBands != 1 && nBands != 3 && nBands != 4)
     {
         CPLError(CE_Failure, CPLE_NotSupported,
@@ -4491,6 +4495,9 @@ GDALDataset *GDALPDFCreateCopy(const char *pszFilename, GDALDataset *poSrcDS,
     const char *pszJavascriptFile =
         CSLFetchNameValue(papszOptions, "JAVASCRIPT_FILE");
 
+    if (!pfnProgress(0.0, nullptr, pProgressData))
+        return nullptr;
+
     /* -------------------------------------------------------------------- */
     /*      Create file.                                                    */
     /* -------------------------------------------------------------------- */