cvs: php3 /functions sysvshm.c
| From: | Hartmut Holzgraefe | Date: | Mon, 18 Dec 2000 12:23:50 +0000 |
| Subject: | cvs: php3 /functions sysvshm.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-3199@lists.php.net to get a copy of this message | ||
hholzgra Mon Dec 18 04:23:50 2000 EDT
Modified files:
/php3/functions sysvshm.c
Log:
fixed BUG #8306: shmat() returns -1 on errors, not NULL
Index: php3/functions/sysvshm.c
diff -u php3/functions/sysvshm.c:1.13 php3/functions/sysvshm.c:1.14
--- php3/functions/sysvshm.c:1.13 Wed Nov 1 08:35:38 2000
+++ php3/functions/sysvshm.c Mon Dec 18 04:23:49 2000
@@ -27,7 +27,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sysvshm.c,v 1.13 2000/11/01 16:35:38 eschmid Exp $ */
+/* $Id: sysvshm.c,v 1.14 2000/12/18 12:23:49 hholzgra Exp $ */
/* This has been built and tested on Solaris 2.6.
* It may not compile or execute correctly on other systems.
@@ -158,7 +158,7 @@
}
}
- if((shm_ptr = shmat(shm_id,NULL,0))==NULL) {
+ if((shm_ptr = shmat(shm_id,NULL,0))==(void *)-1) {
php3_error(E_WARNING, "shmget() failed for key 0x%x: %s", shm_key, strerror(errno));
RETURN_FALSE;
}