source@mandoc.bsd.lv
 help / color / mirror / Atom feed
* mandoc: Fix previous: mmap(2) returns MAP_FAILED on failure, not NULL.
@ 2017-08-26 20:38 schwarze
  0 siblings, 0 replies; only message in thread
From: schwarze @ 2017-08-26 20:38 UTC (permalink / raw)
  To: source

Log Message:
-----------
Fix previous: mmap(2) returns MAP_FAILED on failure, not NULL.
Bug pointed out by tedu@.

Modified Files:
--------------
    mandoc:
        mandocdb.c

Revision Data
-------------
Index: mandocdb.c
===================================================================
RCS file: /home/cvs/mandoc/mandoc/mandocdb.c,v
retrieving revision 1.255
retrieving revision 1.256
diff -Lmandocdb.c -Lmandocdb.c -u -p -r1.255 -r1.256
--- mandocdb.c
+++ mandocdb.c
@@ -2152,7 +2152,7 @@ dbwrite(struct dba *dba)
 		say("", "&%s", tfn);
 		return;
 	}
-	cp1 = cp2 = NULL;
+	cp1 = cp2 = MAP_FAILED;
 	fd1 = fd2 = -1;
 	(void)strlcat(tfn, "/" MANDOC_DB, sizeof(tfn));
 	if (dba_write(tfn, dba) == -1) {
@@ -2178,12 +2178,12 @@ dbwrite(struct dba *dba)
 	if (sb1.st_size != sb2.st_size)
 		goto err;
 	if ((cp1 = mmap(NULL, sb1.st_size, PROT_READ, MAP_PRIVATE,
-	    fd1, 0)) == NULL) {
+	    fd1, 0)) == MAP_FAILED) {
 		say(MANDOC_DB, "&mmap");
 		goto err;
 	}
 	if ((cp2 = mmap(NULL, sb2.st_size, PROT_READ, MAP_PRIVATE,
-	    fd2, 0)) == NULL) {
+	    fd2, 0)) == MAP_FAILED) {
 		say(tfn, "&mmap");
 		goto err;
 	}
@@ -2197,9 +2197,9 @@ err:
 	say(MANDOC_DB, "Data changed, but cannot replace database");
 
 out:
-	if (cp1 != NULL)
+	if (cp1 != MAP_FAILED)
 		munmap(cp1, sb1.st_size);
-	if (cp2 != NULL)
+	if (cp2 != MAP_FAILED)
 		munmap(cp2, sb2.st_size);
 	if (fd1 != -1)
 		close(fd1);
--
 To unsubscribe send an email to source+unsubscribe@mandoc.bsd.lv

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2017-08-26 20:38 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-08-26 20:38 mandoc: Fix previous: mmap(2) returns MAP_FAILED on failure, not NULL schwarze

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).