fixed integer overflow in bytesRead (#543)

nci · Jul 16, 2021 · 327d8ee · 327d8ee
1 parent a1d9721
commit 327d8ee
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/worker/gdalprocess/warp.go b/worker/gdalprocess/warp.go
@@ -174,7 +174,7 @@ func WarpRaster(in *pb.GeoRPCGranule) *pb.Result {
 	var dstBufC unsafe.Pointer
 	var noData float64
 	var dType C.GDALDataType
-	var bytesReadC C.int
+	var bytesReadC C.size_t
 
 	var resUsage0, resUsage1 syscall.Rusage
 	syscall.Getrusage(syscall.RUSAGE_SELF, &resUsage0)

diff --git a/worker/gdalprocess/warper.cxx b/worker/gdalprocess/warper.cxx
@@ -78,7 +78,7 @@ int roundCoord(double coord, int maxExtent) {
 	return c;
 }
 
-int warp_operation_fast(const char *srcFilePath, char *srcProjRef, double *srcGeot, const char **geoLocOpts, const char *dstProjRef, double *dstGeot, int dstXImageSize, int dstYImageSize, int band, int srsCf, void **dstBuf, int *dstBufSize, int *dstBbox, double *noData, GDALDataType *dType, int *bytesRead)
+int warp_operation_fast(const char *srcFilePath, char *srcProjRef, double *srcGeot, const char **geoLocOpts, const char *dstProjRef, double *dstGeot, int dstXImageSize, int dstYImageSize, int band, int srsCf, void **dstBuf, int *dstBufSize, int *dstBbox, double *noData, GDALDataType *dType, size_t *bytesRead)
 {
 	*bytesRead = 0;
 
@@ -331,7 +331,7 @@ int warp_operation_fast(const char *srcFilePath, char *srcProjRef, double *srcGe
 	blockBuffer.resize(srcXBlockSize * srcYBlockSize * srcDataSize);
 	uint8_t* blockBuf = blockBuffer.data();
 
-	int nBlocksRead = 0;
+	size_t nBlocksRead = 0;
 
 	for(const auto& it : blockPixelMap) {
 		const int nPixels = it.second.first.size();

diff --git a/worker/gdalprocess/warper.hxx b/worker/gdalprocess/warper.hxx
@@ -13,7 +13,7 @@
 extern "C" {
 #endif
 
-int warp_operation_fast(const char *srcFilePath, char *srcProjRef, double *srcGeot, const char **geoLocOpts, const char *dstProjRef, double *dstGeot, int dstXImageSize, int dstYImageSize, int band, int srsCf, void **dstBuf, int *dstBufSize, int *dstBbox, double *noData, GDALDataType *dType, int *bytesRead);
+int warp_operation_fast(const char *srcFilePath, char *srcProjRef, double *srcGeot, const char **geoLocOpts, const char *dstProjRef, double *dstGeot, int dstXImageSize, int dstYImageSize, int band, int srsCf, void **dstBuf, int *dstBufSize, int *dstBbox, double *noData, GDALDataType *dType, size_t *bytesRead);
 
 #ifdef __cplusplus
 }