Fix -Wtype-limits warnings (#2756)

* fix -Wtype-limits warnings (GCC) * cast before multiplication to prevent potential overflow
OSGeo · Jan 18, 2023 · 2b946ed · 2b946ed
1 parent c3845b2
commit 2b946ed
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 15 deletions.
diff --git a/lib/gis/copy_dir.c b/lib/gis/copy_dir.c
@@ -79,7 +79,7 @@ int G_recursive_copy(const char *src, const char *dst)
     if (!S_ISDIR(sb.st_mode)) {
         char buf[4096];
         int fd, fd2;
-        size_t len, len2;
+        ssize_t len, len2;
 
         if (G_lstat(dst, &sb) == 0 && S_ISDIR(sb.st_mode)) {
             char path[GPATH_MAX];

diff --git a/vector/v.vol.rst/user1.c b/vector/v.vol.rst/user1.c
@@ -440,8 +440,9 @@ int OUTGR()
         G_fseek(Tmp_fd_z, 0L, 0);
 
         /* Read data in from temp file */
-        read_val = fread(data, sizeof(float), nsizr * nsizc * nsizl, Tmp_fd_z);
-        if (read_val < 0) {
+        read_val =
+            fread(data, sizeof(float), (size_t)nsizr * nsizc * nsizl, Tmp_fd_z);
+        if (read_val != (size_t)nsizr * nsizc * nsizl) {
             clean();
             G_fatal_error(_("Unable to read data from temp file"));
         }
@@ -494,8 +495,9 @@ int OUTGR()
         G_fseek(Tmp_fd_dx, 0L, 0);
 
         /* Read data in from temp file */
-        read_val = fread(data, sizeof(float), nsizr * nsizc * nsizl, Tmp_fd_dx);
-        if (read_val < 0) {
+        read_val = fread(data, sizeof(float), (size_t)nsizr * nsizc * nsizl,
+                         Tmp_fd_dx);
+        if (read_val != (size_t)nsizr * nsizc * nsizl) {
             clean();
             G_fatal_error(_("Unable to read data from temp file"));
         }
@@ -547,8 +549,9 @@ int OUTGR()
         G_fseek(Tmp_fd_dy, 0L, 0);
 
         /* Read data in from temp file */
-        read_val = fread(data, sizeof(float), nsizr * nsizc * nsizl, Tmp_fd_dy);
-        if (read_val < 0) {
+        read_val = fread(data, sizeof(float), (size_t)nsizr * nsizc * nsizl,
+                         Tmp_fd_dy);
+        if (read_val != (size_t)nsizr * nsizc * nsizl) {
             clean();
             G_fatal_error(_("Unable to read data from temp file"));
         }
@@ -600,8 +603,9 @@ int OUTGR()
         G_fseek(Tmp_fd_dz, 0L, 0);
 
         /* Read data in from temp file */
-        read_val = fread(data, sizeof(float), nsizr * nsizc * nsizl, Tmp_fd_dz);
-        if (read_val < 0) {
+        read_val = fread(data, sizeof(float), (size_t)nsizr * nsizc * nsizl,
+                         Tmp_fd_dz);
+        if (read_val != (size_t)nsizr * nsizc * nsizl) {
             clean();
             G_fatal_error(_("Unable to read data from temp file"));
         }
@@ -653,8 +657,9 @@ int OUTGR()
         G_fseek(Tmp_fd_xx, 0L, 0);
 
         /* Read data in from temp file */
-        read_val = fread(data, sizeof(float), nsizr * nsizc * nsizl, Tmp_fd_xx);
-        if (read_val < 0) {
+        read_val = fread(data, sizeof(float), (size_t)nsizr * nsizc * nsizl,
+                         Tmp_fd_xx);
+        if (read_val != (size_t)nsizr * nsizc * nsizl) {
             clean();
             G_fatal_error(_("Unable to read data from temp file"));
         }
@@ -706,8 +711,9 @@ int OUTGR()
         G_fseek(Tmp_fd_yy, 0L, 0);
 
         /* Read data in from temp file */
-        read_val = fread(data, sizeof(float), nsizr * nsizc * nsizl, Tmp_fd_yy);
-        if (read_val < 0) {
+        read_val = fread(data, sizeof(float), (size_t)nsizr * nsizc * nsizl,
+                         Tmp_fd_yy);
+        if (read_val != (size_t)nsizr * nsizc * nsizl) {
             clean();
             G_fatal_error(_("Unable to read data from temp file"));
         }
@@ -759,8 +765,9 @@ int OUTGR()
         G_fseek(Tmp_fd_xy, 0L, 0);
 
         /* Read data in from temp file */
-        read_val = fread(data, sizeof(float), nsizr * nsizc * nsizl, Tmp_fd_xy);
-        if (read_val < 0) {
+        read_val = fread(data, sizeof(float), (size_t)nsizr * nsizc * nsizl,
+                         Tmp_fd_xy);
+        if (read_val != (size_t)nsizr * nsizc * nsizl) {
             clean();
             G_fatal_error(_("Unable to read data from temp file"));
         }