gdal_calc.py: raise exception in case of I/O error. Fixes qgis/QGIS#3…

…6867
OSGeo · Jun 1, 2020 · fb88e3c · fb88e3c
1 parent 2a0f3ea
commit fb88e3c
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/gdal/swig/python/scripts/gdal_calc.py b/gdal/swig/python/scripts/gdal_calc.py
@@ -327,6 +327,8 @@ def doit(opts, args):
                     myval = gdalnumeric.BandReadAsArray(myFiles[i].GetRasterBand(myBandNo),
                                                         xoff=myX, yoff=myY,
                                                         win_xsize=nXValid, win_ysize=nYValid)
+                    if myval is None:
+                        raise Exception('Input block reading failed')
 
                     # fill in nodata values
                     if myNDV[i] is not None:
@@ -355,7 +357,14 @@ def doit(opts, args):
 
                 # write data block to the output file
                 myOutB = myOut.GetRasterBand(bandNo)
-                gdalnumeric.BandWriteArray(myOutB, myResult, xoff=myX, yoff=myY)
+                if gdalnumeric.BandWriteArray(myOutB, myResult, xoff=myX, yoff=myY) != 0:
+                    raise Exception('Block writing failed')
+
+    gdal.ErrorReset()
+    myOut.FlushCache()
+    myOut = None
+    if gdal.GetLastErrorMsg() != '':
+        raise Exception('Dataset writing failed')
 
     if not opts.quiet:
         print("100 - Done")