cvs: php4 /ext/standard file.c
| From: | Sascha Schumann | Date: | Fri, 22 Dec 2000 16:39:01 +0000 |
| Subject: | cvs: php4 /ext/standard file.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-3227@lists.php.net to get a copy of this message | ||
sas Fri Dec 22 08:39:01 2000 EDT
Modified files:
/php4/ext/standard file.c
Log:
NULL is a valid return value of mmap. Check against (void *) MAP_FAILED.
Index: php4/ext/standard/file.c
diff -u php4/ext/standard/file.c:1.129 php4/ext/standard/file.c:1.130
--- php4/ext/standard/file.c:1.129 Fri Dec 22 08:34:11 2000
+++ php4/ext/standard/file.c Fri Dec 22 08:39:01 2000
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: file.c,v 1.129 2000/12/22 16:34:11 sas Exp $ */
+/* $Id: file.c,v 1.130 2000/12/22 16:39:01 sas Exp $ */
/* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
@@ -1687,7 +1687,7 @@
goto cleanup;
}
srcfile = mmap(NULL, sbuf.st_size, PROT_READ, MAP_SHARED, fd_s, 0);
- if (srcfile) {
+ if (srcfile != (void *) MAP_FAILED) {
write(fd_t, srcfile, sbuf.st_size);
ret = SUCCESS;
munmap(srcfile, sbuf.st_size);