lib/raster: Fix "Implicit conversion loses precision" warnings

Author: nilason

lib/raster/cats.c

@@ -222,7 +222,7 @@ static CELL read_cats(const char *element, const char *name, const char *mapset,
 
     Rast_init_cats(buff, pcats);
     if (num >= 0)
-        pcats->num = num;
+        pcats->num = (CELL)num;
 
     if (!old) {
         char fmt[256];

lib/raster/get_row.c

@@ -9,6 +9,7 @@
    \author Original author CERL
  */
 
+#include <limits.h>
 #include <stdint.h>
 #include <string.h>
 #include <unistd.h>
@@ -98,21 +99,24 @@ static void read_data_fp_compressed(int fd, int row, unsigned char *data_buf,
 
     *nbytes = fcb->nbytes;
 
-    ret = G_read_compressed(fcb->data_fd, readamount, data_buf, bufsize,
-                            fcb->cellhd.compressed);
+    if (readamount > INT_MAX || bufsize > INT_MAX)
+        G_fatal_error(_("Compressed fp raster row for <%s> is too large"),
+                      fcb->name);
+
+    ret = G_read_compressed(fcb->data_fd, (int)readamount, data_buf,
+                            (int)bufsize, fcb->cellhd.compressed);
     if (ret <= 0)
         G_fatal_error(_("Error uncompressing fp raster data for row %d of "
                         "<%s>: error code %d"),
                       row, fcb->name, ret);
 }
 
 static void rle_decompress(unsigned char *dst, const unsigned char *src,
-                           int nbytes, int size)
+                           int nbytes, size_t size)
 {
-    int pairs = size / (nbytes + 1);
-    int i;
+    size_t pairs = size / ((size_t)nbytes + 1);
 
-    for (i = 0; i < pairs; i++) {
+    for (size_t i = 0; i < pairs; i++) {
         int repeat = *src++;
         int j;
 
@@ -131,19 +135,32 @@ static void read_data_compressed(int fd, int row, unsigned char *data_buf,
     struct fileinfo *fcb = &R__.fileinfo[fd];
     off_t t1 = fcb->row_ptr[row];
     off_t t2 = fcb->row_ptr[row + 1];
-    ssize_t readamount = t2 - t1;
+    off_t row_size;
+    size_t readamount;
     size_t bufsize;
     unsigned char *cmp, *cmp2;
     int n;
 
+    if (t2 < t1)
+        G_fatal_error(_("Invalid raster row offset for row %d of <%s>"), row,
+                      fcb->name);
+
+    row_size = t2 - t1;
+    if (row_size > SSIZE_MAX)
+        G_fatal_error(_("Compressed raster row for <%s> is too large"),
+                      fcb->name);
+
+    readamount = (size_t)row_size;
+
     if (lseek(fcb->data_fd, t1, SEEK_SET) == -1)
         G_fatal_error(
             _("Error seeking raster data file for row %d of <%s>: %s"), row,
             fcb->name, strerror(errno));
 
     cmp = G_malloc(readamount);
 
-    if (read(fcb->data_fd, cmp, readamount) != readamount) {
+    ssize_t nread = read(fcb->data_fd, cmp, readamount);
+    if (nread < 0 || (size_t)nread != readamount) {
         G_free(cmp);
         G_fatal_error(_("Error reading raster data for row %d of <%s>: %s"),
                       row, fcb->name, strerror(errno));
@@ -154,6 +171,12 @@ static void read_data_compressed(int fd, int row, unsigned char *data_buf,
 
     /* Now decompress the row */
     if (fcb->cellhd.compressed > 0) {
+        if (readamount == 0) {
+            G_free(cmp2);
+            G_fatal_error(_("Error reading raster data for row %d of <%s>"),
+                          row, fcb->name);
+        }
+
         /* one byte is nbyte count */
         n = *nbytes = *cmp++;
         readamount--;
@@ -167,9 +190,13 @@ static void read_data_compressed(int fd, int row, unsigned char *data_buf,
         if (fcb->cellhd.compressed == 1)
             rle_decompress(data_buf, cmp, n, readamount);
         else {
-            if ((n = G_expand(cmp, readamount, data_buf, bufsize,
+            if (readamount > INT_MAX || bufsize > INT_MAX)
+                G_fatal_error(_("Compressed raster row for <%s> is too large"),
+                              fcb->name);
+
+            if ((n = G_expand(cmp, (int)readamount, data_buf, (int)bufsize,
                               fcb->cellhd.compressed)) < 0 ||
-                (unsigned int)n != bufsize) {
+                (size_t)n != bufsize) {
                 G_fatal_error(
                     _("Error uncompressing raster data for row %d of <%s>"),
                     row, fcb->name);
@@ -612,7 +639,7 @@ static void get_map_row(int fd, void *rast, int row, RASTER_MAP_TYPE data_type,
                         int null_is_zero, int with_mask)
 {
     struct fileinfo *fcb = &R__.fileinfo[fd];
-    int size = Rast_cell_size(data_type);
+    size_t size = Rast_cell_size(data_type);
     CELL *temp_buf = NULL;
     void *buf;
     int type;
@@ -844,16 +871,15 @@ static int read_null_bits_compressed(int null_fd, unsigned char *flags, int row,
     off_t t2 = fcb->null_row_ptr[row + 1];
     size_t readamount = t2 - t1;
     unsigned char *compressed_buf;
-    int res;
+    ssize_t res;
 
     if (lseek(null_fd, t1, SEEK_SET) == -1)
         G_fatal_error(
             _("Error seeking compressed null data for row %d of <%s>"), row,
             fcb->name);
 
     if (readamount == size) {
-        if ((res = read(null_fd, flags, size)) < 0 ||
-            (unsigned int)res != size) {
+        if ((res = read(null_fd, flags, size)) < 0 || (size_t)res != size) {
             G_fatal_error(
                 _("Error reading compressed null data for row %d of <%s>"), row,
                 fcb->name);
@@ -864,15 +890,19 @@ static int read_null_bits_compressed(int null_fd, unsigned char *flags, int row,
     compressed_buf = G_malloc(readamount);
 
     if ((res = read(null_fd, compressed_buf, readamount)) < 0 ||
-        (unsigned int)res != readamount) {
+        (size_t)res != readamount) {
         G_free(compressed_buf);
         G_fatal_error(
             _("Error reading compressed null data for row %d of <%s>"), row,
             fcb->name);
     }
 
     /* null bits file compressed with LZ4, see lib/gis/compress.h */
-    if (G_lz4_expand(compressed_buf, readamount, flags, size) < 1) {
+    if (readamount > INT_MAX || size > INT_MAX)
+        G_fatal_error(_("Compressed null data for row %d of <%s> is too large"),
+                      row, fcb->name);
+
+    if (G_lz4_expand(compressed_buf, (int)readamount, flags, (int)size) < 1) {
         G_fatal_error(_("Error uncompressing null data for row %d of <%s>"),
                       row, fcb->name);
     }

lib/raster/get_row_colr.c

@@ -39,7 +39,7 @@ void Rast_get_row_colors(int fd, int row, struct Colors *colors,
 {
     int cols = Rast_window_cols();
     int type = Rast_get_map_type(fd);
-    int size = Rast_cell_size(type);
+    size_t size = Rast_cell_size(type);
     void *array;
     unsigned char *set;
     void *p;

lib/raster/history.c

@@ -272,7 +272,7 @@ void Rast_short_history(const char *name, const char *type,
 int Rast_command_history(struct History *hist)
 {
     char *cmdlin;
-    int cmdlen;
+    size_t cmdlen;
 
     cmdlin = G_recreate_command();
     cmdlen = strlen(cmdlin);

lib/raster/null_val.c

@@ -79,7 +79,7 @@ void Rast__set_null_value(void *rast, int numVals, int null_is_zero,
                           RASTER_MAP_TYPE data_type)
 {
     if (null_is_zero) {
-        G_zero((char *)rast, numVals * Rast_cell_size(data_type));
+        G_zero((char *)rast, numVals * (int)Rast_cell_size(data_type));
         return;
     }
 

lib/raster/open.c

@@ -537,7 +537,7 @@ static int open_raster_new_gdal(char *map, char *mapset,
 
     fcb->cellhd = R__.wr_window;
     fcb->cellhd.compressed = 0;
-    fcb->nbytes = Rast_cell_size(fcb->map_type);
+    fcb->nbytes = (int)Rast_cell_size(fcb->map_type);
     /* for writing fcb->data is allocated to be R__.wr_window.cols *
        sizeof(CELL or DCELL or FCELL)  */
     fcb->data = G_calloc(R__.wr_window.cols, fcb->nbytes);

lib/raster/put_row.c

@@ -13,6 +13,7 @@
 
  **********************************************************************/
 
+#include <limits.h>
 #include <string.h>
 
 #include <sys/types.h>
@@ -424,7 +425,7 @@ static void put_data_gdal(int fd, const void *rast, int row, int n,
                           int zeros_r_nulls, RASTER_MAP_TYPE map_type)
 {
     struct fileinfo *fcb = &R__.fileinfo[fd];
-    int size = Rast_cell_size(map_type);
+    size_t size = Rast_cell_size(map_type);
     DCELL null_val = fcb->gdal->null_val;
     const void *src;
     void *work_buf, *dst;
@@ -511,8 +512,14 @@ static void write_null_bits_compressed(const unsigned char *flags, int row,
     struct fileinfo *fcb = &R__.fileinfo[fd];
     unsigned char *compressed_buf;
     ssize_t nwrite;
-    size_t cmax;
-    int res;
+    int compressed_size;
+    int compressed_bound;
+    ssize_t res;
+
+    if (size > INT_MAX)
+        G_fatal_error(_("Null row is too large to compress"));
+
+    compressed_size = (int)size;
 
     fcb->null_row_ptr[row] = lseek(fcb->null_fd, 0L, SEEK_CUR);
     if (fcb->null_row_ptr[row] == -1) {
@@ -522,22 +529,22 @@ static void write_null_bits_compressed(const unsigned char *flags, int row,
     }
 
     /* get upper bound of compressed size */
-    cmax = G_compress_bound(size, 3);
-    compressed_buf = G_malloc(cmax);
+    compressed_bound = G_compress_bound(compressed_size, 3);
+    compressed_buf = G_malloc((size_t)compressed_bound);
 
     /* compress null bits file with LZ4, see lib/gis/compress.h */
-    nwrite = G_compress((unsigned char *)flags, size, compressed_buf, cmax, 3);
+    nwrite = G_compress((unsigned char *)flags, compressed_size, compressed_buf,
+                        compressed_bound, 3);
 
     if (nwrite > 0 && (size_t)nwrite < size) {
-        if ((res = write(fcb->null_fd, compressed_buf, nwrite)) < 0 ||
-            (unsigned int)res != nwrite)
+        if ((res = write(fcb->null_fd, compressed_buf, (size_t)nwrite)) < 0 ||
+            res != nwrite)
             G_fatal_error(
                 _("Error writing compressed null data for row %d of <%s>: %s"),
                 row, fcb->name, strerror(errno));
     }
     else {
-        if ((res = write(fcb->null_fd, flags, size)) < 0 ||
-            (unsigned int)res != size)
+        if ((res = write(fcb->null_fd, flags, size)) < 0 || (size_t)res != size)
             G_fatal_error(
                 _("Error writing compressed null data for row %d of <%s>: %s"),
                 row, fcb->name, strerror(errno));
@@ -562,7 +569,7 @@ void Rast__write_null_bits(int fd, const unsigned char *flags)
     int row = fcb->null_cur_row++;
     off_t offset;
     size_t size;
-    int res;
+    ssize_t res;
 
     size = Rast__null_bitstream_size(fcb->cellhd.cols);
 
@@ -576,8 +583,7 @@ void Rast__write_null_bits(int fd, const unsigned char *flags)
     if (lseek(fcb->null_fd, offset, SEEK_SET) == -1)
         G_fatal_error(_("Error writing null row %d of <%s>"), row, fcb->name);
 
-    if ((res = write(fcb->null_fd, flags, size)) < 0 ||
-        (unsigned int)res != size)
+    if ((res = write(fcb->null_fd, flags, size)) < 0 || (size_t)res != size)
         G_fatal_error(_("Error writing null row %d of <%s>: %s"), row,
                       fcb->name, strerror(errno));
 }

lib/raster/reclass.c

@@ -79,7 +79,8 @@ int Rast_is_reclassed_to(const char *name, const char *mapset, int *nrmaps,
                          char ***rmaps)
 {
     FILE *fd;
-    int i, j, k, l;
+    int i;
+    size_t j, k, l;
     char buf2[256], buf3[256];
 
     fd = G_fopen_old_misc("cell_misc", "reclassed_to", name, mapset);