Eliminate 'passing tainted var maps_buf to tainted sink' code defect FP v2

(fix of commit c29373ea1)

* os_dep.c [NEED_PROC_MAPS && LINT2] (GC_get_maps): Pass value of
maps_buf to GC_noop1 (instead of BZERO) and do not pass maps_buf to
GC_scratch_recycle_no_gww.

1 files changed, 3 insertions, 3 deletions

diff --git a/os_dep.c b/os_dep.c
index e4fcface..e80e75a6 100644
--- a/os_dep.c
+++ b/os_dep.c
@@ -201,10 +201,10 @@ GC_INNER char * GC_get_maps(void)
             while (maps_size >= maps_buf_sz) {
 #             ifdef LINT2
                 /* Workaround passing tainted maps_buf to a tainted sink. */
-                if (maps_buf != NULL)
-                  BZERO(maps_buf, maps_buf_sz);
+                GC_noop1((word)maps_buf);
+#             else
+                GC_scratch_recycle_no_gww(maps_buf, maps_buf_sz);
 #             endif
-              GC_scratch_recycle_no_gww(maps_buf, maps_buf_sz);
               /* Grow only by powers of 2, since we leak "too small" buffers.*/
               while (maps_size >= maps_buf_sz) maps_buf_sz *= 2;
               maps_buf = GC_scratch_alloc(maps_buf_sz);