Changeset 1747 for zzuf/trunk/test/zzcat.cTweet

Timestamp:

Feb 19, 2007, 11:25:54 AM (16 years ago)

Author:

Sam Hocevar

Message:

• Check mmap() return value.
• Don't pass offsets to mmap() that are not page aligned.

File:

• zzuf/trunk/test/zzcat.c (modified) (2 diffs)

zzuf/trunk/test/zzcat.c

@@ -113 +113 @@
         for(i = 0; i < 128; i++)
         {
-            int moff = myrand() % len;
-            int mlen = myrand() % (len - moff);
-            char *map = mmap(NULL, mlen, PROT_READ, MAP_PRIVATE, fd, moff);
+            char *map;
+            int moff, mlen, pgsz = len + 1;
+#ifdef HAVE_GETPAGESIZE
+            pgsz = getpagesize();
+#endif
+            moff = len < pgsz ? 0 : (myrand() % (len / pgsz)) * pgsz;
+            mlen = 1 + (myrand() % (len - moff));
+            map = mmap(NULL, mlen, PROT_READ, MAP_PRIVATE, fd, moff);
+            if(map == MAP_FAILED)
+                return EXIT_FAILURE;
             for(j = 0; j < 128; j++)
             {
                 int x = myrand() % mlen;
-                data[moff + x] = data[x];
+                data[moff + x] = map[x];
             }
             munmap(map, mlen);
@@ -125 +132 @@
 #endif
         close(fd);
+        break;
+    default:
+        return EXIT_FAILURE;
     }