Changeset 383 for trunk/src/dnmalloc.c

Timestamp:

Dec 5, 2011, 10:30:33 PM (13 years ago)

Author:

katerina

Message:

Fix for ticket #281 (warnings from clang static analyzer).

File:

• trunk/src/dnmalloc.c (modified) (5 diffs)

trunk/src/dnmalloc.c

@@ -2854 +2854 @@
       assert(temp != NULL);
 #endif
-      prevtemp->hash_next = temp->hash_next;
+      if (temp) prevtemp->hash_next = temp->hash_next;
     }
 }
@@ -3558 +3558 @@
     
     else {
-      front_misalign = 0;
-      end_misalign = 0;
+      /* front_misalign = 0; *//*superfluous */
+      /* end_misalign = 0; *//*superfluous */
       correction = 0;
       aligned_brk = brk;
@@ -4284 +4284 @@
   retval = sYSMALLOc(nb, av);
   if (retval) {
-    victim = mem2chunk(retval);
+#if PARANOIA > 2
+    victim = mem2chunk(retval); /* is used in guard_set macro */
+#endif
     guard_set(av->guard_stored, victim, bytes, nb);
   }
@@ -5516 +5518 @@
         } rdat;
 #if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__)
-        size_t sz = 0;
+        ssize_t sz = 0;
         int    fd;
 #endif
@@ -5540 +5542 @@
         fd = open("/dev/urandom", O_RDONLY);
         if (fd != -1) {
-                sz = (size_t)read(fd, rdat.rnd, sizeof (rdat.rnd));
-                close(fd);
+                sz = (size_t)read(fd, rdat.rnd, sizeof (rdat.rnd));
+                /* 
+                 * gcc complains if we ignore the return value of read(), and
+                 * the llvm/clang analyzer complains if we don't use it...
+                 */
+                if (sz > (-256)) /* always true */
+                  close(fd);
         }
+        /*
         if (sz > sizeof (rdat.rnd))
                 sz = 0;
+        */
  #endif