From: Ivan Maidanski <ivmai@mail.ru>
Date: Mon, 3 Oct 2016 20:34:56 +0000 (+0300)
Subject: Workaround 'mmap() resource handle leak' static analyzer warning
X-Git-Tag: v7.6.2~378
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cfdf2370c815a5d6be01a1594541f8708c86e8d8;p=gc

Workaround 'mmap() resource handle leak' static analyzer warning

* os_dep.c [USE_MUNMAP && LINT2] (GC_unmap, GC_remap, GC_unmap_gap):
Call GC_noop1(result) where result is returned by mmap or VirtualAlloc.
* os_dep.c [USE_MUNMAP && NACL] (GC_remap): Rename mmap_result local
variable to result.
* os_dep.c [USE_MUNMAP && !USE_WINALLOC] (GC_unmap_gap): Update
GC_unmapped_bytes (by len) only if len is non-zero.
---

diff --git a/os_dep.c b/os_dep.c
index 9a489125..a28697c0 100644
--- a/os_dep.c
+++ b/os_dep.c
@@ -2420,6 +2420,10 @@ GC_INNER void GC_unmap(ptr_t start, size_t bytes)
                       zero_fd, 0/* offset */);
         if (result != (void *)start_addr)
           ABORT("mmap(PROT_NONE) failed");
+#       ifdef LINT2
+          /* Explicitly store the resource handle to a global variable. */
+          GC_noop1((word)result);
+#       endif
       }
       GC_unmapped_bytes += len;
 #   endif
@@ -2454,6 +2458,9 @@ GC_INNER void GC_remap(ptr_t start, size_t bytes)
                   ABORT("VirtualAlloc remapping failed");
               }
           }
+#         ifdef LINT2
+            GC_noop1((word)result);
+#         endif
           GC_unmapped_bytes -= alloc_len;
           start_addr += alloc_len;
           len -= alloc_len;
@@ -2463,12 +2470,15 @@ GC_INNER void GC_remap(ptr_t start, size_t bytes)
       {
 #       ifdef NACL
           /* NaCl does not expose mprotect, but mmap should work fine.  */
-          void *mmap_result = mmap(start_addr, len, (PROT_READ | PROT_WRITE)
+          void *result = mmap(start_addr, len, (PROT_READ | PROT_WRITE)
                                     | (GC_pages_executable ? PROT_EXEC : 0),
                                    MAP_PRIVATE | MAP_FIXED | OPT_MAP_ANON,
                                    zero_fd, 0 /* offset */);
-          if (mmap_result != (void *)start_addr)
+          if (result != (void *)start_addr)
             ABORT("mmap as mprotect failed");
+#         ifdef LINT2
+            GC_noop1((word)result);
+#         endif
 #       else
           if (mprotect(start_addr, len, (PROT_READ | PROT_WRITE)
                             | (GC_pages_executable ? PROT_EXEC : 0)) != 0) {
@@ -2526,8 +2536,11 @@ GC_INNER void GC_unmap_gap(ptr_t start1, size_t bytes1, ptr_t start2,
                       zero_fd, 0/* offset */);
         if (result != (void *)start_addr)
           ABORT("mmap(PROT_NONE) failed");
+#       ifdef LINT2
+          GC_noop1((word)result);
+#       endif
+        GC_unmapped_bytes += len;
       }
-      GC_unmapped_bytes += len;
 #   endif
 }