From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from localhost (fantadrom.bsd.lv [local])
	by fantadrom.bsd.lv (OpenSMTPD) with ESMTPA id 328eebd6
	for <source@mandoc.bsd.lv>;
	Sat, 26 Aug 2017 15:38:44 -0500 (EST)
Date: Sat, 26 Aug 2017 15:38:44 -0500 (EST)
Message-Id: <13909620224553425838.enqueue@fantadrom.bsd.lv>
X-Mailinglist: mandoc-source
Reply-To: source@mandoc.bsd.lv
MIME-Version: 1.0
From: schwarze@mandoc.bsd.lv
To: source@mandoc.bsd.lv
Subject: mandoc: Fix previous: mmap(2) returns MAP_FAILED on failure, not NULL.
X-Mailer: activitymail 1.26, http://search.cpan.org/dist/activitymail/
Content-Type: text/plain; charset=utf-8

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