Fix CodeQL cpp/integer-multiplication-cast-to-long warnings

MapServer · Jan 10, 2024 · 5c86716 · 5c86716
1 parent 5ac56b1
commit 5c86716
Show file tree

Hide file tree

Showing 11 changed files with 40 additions and 37 deletions.
diff --git a/src/interpolation.c b/src/interpolation.c
@@ -161,9 +161,10 @@ int msInterpolationDataset(mapObj *map, imageObj *image,
       int l, p, s, c;
       double weight = 1.0;
       if (!values) { /* defer allocation until we effectively have a feature */
-        values = (float *)msSmallCalloc(im_width * im_height, sizeof(float));
-        xyz_values =
-            (float *)msSmallCalloc(im_width * im_height, sizeof(float));
+        values = (float *)msSmallCalloc(((size_t)im_width) * im_height,
+                                        sizeof(float));
+        xyz_values = (float *)msSmallCalloc(((size_t)im_width) * im_height,
+                                            sizeof(float));
       }
       if (layer->project)
         msProjectShape(&layer->projection, &map->projection, &shape);
@@ -232,10 +233,10 @@ int msInterpolationDataset(mapObj *map, imageObj *image,
 
   if (npoints > 0 && interpParams.expand_searchrect) {
     iValues =
-        msSmallMalloc(image->width * image->height * sizeof(unsigned char));
+        msSmallMalloc(sizeof(unsigned char) * image->width * image->height);
   } else {
     iValues =
-        msSmallCalloc(1, image->width * image->height * sizeof(unsigned char));
+        msSmallCalloc(1, sizeof(unsigned char) * image->width * image->height);
   }
 
   if (npoints >

diff --git a/src/kerneldensity.c b/src/kerneldensity.c
@@ -33,7 +33,7 @@
 #include "gdal.h"
 
 static void gaussian_blur(float *values, int width, int height, int radius) {
-  float *tmp = (float *)msSmallMalloc(width * height * sizeof(float));
+  float *tmp = (float *)msSmallMalloc(sizeof(float) * width * height);
   int length = radius * 2 + 1;
   float *kernel = (float *)msSmallMalloc(length * sizeof(float));
   float sigma = radius / 3.0;
@@ -46,7 +46,7 @@ static void gaussian_blur(float *values, int width, int height, int radius) {
     float v = a * exp(-(x * x) / den);
     kernel[i] = v;
   }
-  memset(tmp, 0, width * height * sizeof(float));
+  memset(tmp, 0, sizeof(float) * width * height);
 
   for (y = 0; y < height; y++) {
     float *src_row = values + width * y;

diff --git a/src/mapcairo.c b/src/mapcairo.c
@@ -775,10 +775,10 @@ int getRasterBufferCopyCairo(imageObj *img, rasterBufferObj *rb) {
   rb->data.rgba.pixel_step = 4;
   rb->width = cairo_image_surface_get_width(r->surface);
   rb->height = cairo_image_surface_get_height(r->surface);
-  pb = (unsigned char *)malloc(rb->height * rb->data.rgba.row_step *
-                               sizeof(unsigned char));
+  pb = (unsigned char *)malloc(sizeof(unsigned char) * rb->height *
+                               rb->data.rgba.row_step);
   memcpy(pb, cairo_image_surface_get_data(r->surface),
-         rb->height * rb->data.rgba.row_step);
+         ((size_t)rb->height) * rb->data.rgba.row_step);
   rb->data.rgba.pixels = pb;
   rb->data.rgba.r = &(pb[2]);
   rb->data.rgba.g = &(pb[1]);
@@ -950,8 +950,8 @@ int initializeRasterBufferCairo(rasterBufferObj *rb, int width, int height,
   rb->height = height;
   rb->data.rgba.pixel_step = 4;
   rb->data.rgba.row_step = width * 4;
-  rb->data.rgba.pixels =
-      (unsigned char *)calloc(width * height * 4, sizeof(unsigned char));
+  rb->data.rgba.pixels = (unsigned char *)calloc(((size_t)width) * height * 4,
+                                                 sizeof(unsigned char));
   rb->data.rgba.r = &(rb->data.rgba.pixels[2]);
   rb->data.rgba.g = &(rb->data.rgba.pixels[1]);
   rb->data.rgba.b = &(rb->data.rgba.pixels[0]);
@@ -1113,7 +1113,7 @@ int msRenderRasterizedSVGSymbol(imageObj *img, double x, double y,
     initializeRasterBufferCairo(svg_cache->pixmap_buffer, surface_w, surface_h,
                                 0);
     memcpy(svg_cache->pixmap_buffer->data.rgba.pixels, pb,
-           surface_w * surface_h * 4 * sizeof(unsigned char));
+           sizeof(unsigned char) * surface_w * surface_h * 4);
     svg_cache->scale = style->scale;
     svg_cache->rotation = style->rotation;
     cairo_destroy(cr);

diff --git a/src/mapcopy.c b/src/mapcopy.c
@@ -1270,9 +1270,9 @@ int msCopyRasterBuffer(rasterBufferObj *dst, const rasterBufferObj *src) {
   if (src->type == MS_BUFFER_BYTE_RGBA) {
     dst->data.rgba = src->data.rgba;
     dst->data.rgba.pixels =
-        msSmallMalloc(src->height * src->data.rgba.row_step);
+        msSmallMalloc(((size_t)src->height) * src->data.rgba.row_step);
     memcpy(dst->data.rgba.pixels, src->data.rgba.pixels,
-           src->data.rgba.row_step * src->height);
+           ((size_t)src->data.rgba.row_step) * src->height);
     dst->data.rgba.r =
         dst->data.rgba.pixels + (src->data.rgba.r - src->data.rgba.pixels);
     dst->data.rgba.g =

diff --git a/src/mapdrawgdal.c b/src/mapdrawgdal.c
@@ -505,7 +505,8 @@ int msDrawRasterLayerGDAL(mapObj *map, layerObj *layer, imageObj *image,
   /*
    * Allocate imagery buffers.
    */
-  pabyRaw1 = (unsigned char *)malloc(dst_xsize * dst_ysize * band_count);
+  pabyRaw1 =
+      (unsigned char *)malloc(((size_t)dst_xsize) * dst_ysize * band_count);
   if (pabyRaw1 == NULL) {
     msSetError(MS_MEMERR, "Allocating work image of size %dx%dx%d failed.",
                "msDrawRasterLayerGDAL()", dst_xsize, dst_ysize, band_count);
@@ -710,8 +711,8 @@ int msDrawRasterLayerGDAL(mapObj *map, layerObj *layer, imageObj *image,
 
       band_count++;
 
-      pabyRaw1 = (unsigned char *)realloc(pabyOrig,
-                                          dst_xsize * dst_ysize * band_count);
+      pabyRaw1 = (unsigned char *)realloc(pabyOrig, ((size_t)dst_xsize) *
+                                                        dst_ysize * band_count);
 
       if (pabyRaw1 == NULL) {
         msSetError(MS_MEMERR, "Allocating work image of size %dx%dx%d failed.",
@@ -1779,7 +1780,7 @@ msDrawRasterLayerGDAL_RawMode(mapObj *map, layerObj *layer, imageObj *image,
   /* -------------------------------------------------------------------- */
   /*      Allocate buffer, and read data into it.                         */
   /* -------------------------------------------------------------------- */
-  pBuffer = malloc(dst_xsize * dst_ysize * image->format->bands *
+  pBuffer = malloc(((size_t)dst_xsize) * dst_ysize * image->format->bands *
                    (GDALGetDataTypeSize(eDataType) / 8));
   if (pBuffer == NULL) {
     msSetError(MS_MEMERR, "Allocating work image of size %dx%d failed.",

diff --git a/src/mapimageio.c b/src/mapimageio.c
@@ -219,7 +219,7 @@ int saveAsJPEG(mapObj *map, rasterBufferObj *rb, streamInfo *info,
 
   jpeg_start_compress(&cinfo, TRUE);
   rowdata =
-      (JSAMPLE *)malloc(rb->width * cinfo.input_components * sizeof(JSAMPLE));
+      (JSAMPLE *)malloc(sizeof(JSAMPLE) * rb->width * cinfo.input_components);
 
   for (row = 0; row < rb->height; row++) {
     JSAMPLE *pixptr = rowdata;
@@ -476,7 +476,7 @@ int saveAsPNG(mapObj *map, rasterBufferObj *rb, streamInfo *info,
     qrb.width = rb->width;
     qrb.height = rb->height;
     qrb.data.palette.pixels =
-        (unsigned char *)malloc(qrb.width * qrb.height * sizeof(unsigned char));
+        (unsigned char *)malloc(sizeof(unsigned char) * qrb.width * qrb.height);
     qrb.data.palette.scaling_maxval = 255;
     int ret;
     if (force_pc256) {
@@ -667,7 +667,7 @@ int readPNG(char *path, rasterBufferObj *rb) {
   rb->height = height;
   rb->type = MS_BUFFER_BYTE_RGBA;
   rb->data.rgba.pixels =
-      (unsigned char *)malloc(width * height * 4 * sizeof(unsigned char));
+      (unsigned char *)malloc(sizeof(unsigned char) * width * height * 4);
   row_pointers = (unsigned char **)malloc(height * sizeof(unsigned char *));
   rb->data.rgba.pixel_step = 4;
   rb->data.rgba.row_step = width * 4;
@@ -897,8 +897,8 @@ int readGIF(char *path, rasterBufferObj *rb) {
   rb->height = image->SHeight;
   rb->data.rgba.row_step = rb->width * 4;
   rb->data.rgba.pixel_step = 4;
-  rb->data.rgba.pixels = (unsigned char *)malloc(rb->width * rb->height * 4 *
-                                                 sizeof(unsigned char));
+  rb->data.rgba.pixels = (unsigned char *)malloc(sizeof(unsigned char) *
+                                                 rb->width * rb->height * 4);
   b = rb->data.rgba.b = &rb->data.rgba.pixels[0];
   g = rb->data.rgba.g = &rb->data.rgba.pixels[1];
   r = rb->data.rgba.r = &rb->data.rgba.pixels[2];

diff --git a/src/maplegend.c b/src/maplegend.c
@@ -51,8 +51,8 @@ static int msDrawGradientSymbol(rendererVTableObj *renderer,
   rb->height = height;
   rb->data.rgba.row_step = rb->width * 4;
   rb->data.rgba.pixel_step = 4;
-  rb->data.rgba.pixels = (unsigned char *)malloc(rb->width * rb->height * 4 *
-                                                 sizeof(unsigned char));
+  rb->data.rgba.pixels = (unsigned char *)malloc(sizeof(unsigned char) *
+                                                 rb->width * rb->height * 4);
   b = rb->data.rgba.b = &rb->data.rgba.pixels[0];
   g = rb->data.rgba.g = &rb->data.rgba.pixels[1];
   r = rb->data.rgba.r = &rb->data.rgba.pixels[2];

diff --git a/src/mappostgis.cpp b/src/mappostgis.cpp
@@ -348,7 +348,7 @@ static void wkbSkipGeometry(wkbObj *w) {
   case WKB_CIRCULARSTRING:
   case WKB_LINESTRING: {
     const int npoints = wkbReadInt(w);
-    w->ptr += npoints * nCoordDim * sizeof(double);
+    w->ptr += sizeof(double) * npoints * nCoordDim;
     break;
   }
   case WKB_POLYGON: {
@@ -357,7 +357,7 @@ static void wkbSkipGeometry(wkbObj *w) {
       return;
     for (int i = 0; i < nrings; i++) {
       const int npoints = wkbReadInt(w);
-      w->ptr += npoints * nCoordDim * sizeof(double);
+      w->ptr += sizeof(double) * npoints * nCoordDim;
     }
     break;
   }

diff --git a/src/maprasterquery.c b/src/maprasterquery.c
@@ -239,7 +239,8 @@ static void msRasterQueryAddPixel(layerObj *layer, pointObj *location,
       rlinfo->qc_y_reproj =
           (double *)msSmallCalloc(sizeof(double), rlinfo->query_alloc_max);
       rlinfo->qc_values = (float *)msSmallCalloc(
-          sizeof(float), rlinfo->query_alloc_max * rlinfo->band_count);
+          sizeof(float),
+          ((size_t)rlinfo->query_alloc_max) * rlinfo->band_count);
       rlinfo->qc_red =
           (int *)msSmallCalloc(sizeof(int), rlinfo->query_alloc_max);
       rlinfo->qc_green =
@@ -503,8 +504,8 @@ static int msRasterQueryByRectLow(mapObj *map, layerObj *layer,
   /*      band in the file.  Later we will deal with the various band     */
   /*      selection criteria.                                             */
   /* -------------------------------------------------------------------- */
-  pafRaster =
-      (float *)calloc(sizeof(float), nWinXSize * nWinYSize * nBandCount);
+  pafRaster = (float *)calloc(sizeof(float),
+                              ((size_t)nWinXSize) * nWinYSize * nBandCount);
   MS_CHECK_ALLOC(pafRaster, sizeof(float) * nWinXSize * nWinYSize * nBandCount,
                  -1);
 

diff --git a/src/maputfgrid.cpp b/src/maputfgrid.cpp
@@ -262,7 +262,7 @@ static imageObj *utfgridCreateImage(int width, int height,
   r->width = width / r->utfresolution;
   r->height = height / r->utfresolution;
 
-  r->buffer.resize(r->width * r->height);
+  r->buffer.resize(static_cast<size_t>(r->width) * r->height);
 
   /* AGG specific operations */
   r->m_rendering_buffer.attach(&r->buffer[0], r->width, r->height, r->width);

diff --git a/src/maputil.c b/src/maputil.c
@@ -1767,14 +1767,14 @@ imageObj *msImageCreate(int width, int height, outputFormatObj *format,
     }
 
     if (format->imagemode == MS_IMAGEMODE_INT16)
-      image->img.raw_16bit =
-          (short *)msSmallCalloc(sizeof(short), width * height * format->bands);
+      image->img.raw_16bit = (short *)msSmallCalloc(
+          sizeof(short), ((size_t)width) * height * format->bands);
     else if (format->imagemode == MS_IMAGEMODE_FLOAT32)
-      image->img.raw_float =
-          (float *)msSmallCalloc(sizeof(float), width * height * format->bands);
+      image->img.raw_float = (float *)msSmallCalloc(
+          sizeof(float), ((size_t)width) * height * format->bands);
     else if (format->imagemode == MS_IMAGEMODE_BYTE)
       image->img.raw_byte = (unsigned char *)msSmallCalloc(
-          sizeof(unsigned char), width * height * format->bands);
+          sizeof(unsigned char), ((size_t)width) * height * format->bands);
 
     if (image->img.raw_16bit == NULL) {
       msFree(image);