cvs: php4 /ext/standard fsock.c
| From: | Andi Gutmans | Date: | Sun, 27 Aug 2000 04:14:48 +0000 |
| Subject: | cvs: php4 /ext/standard fsock.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-1402@lists.php.net to get a copy of this message | ||
andi Sat Aug 26 21:14:48 2000 EDT
Modified files:
/php4/ext/standard fsock.c
Log:
- Fix possible overflow in fsockopen().
Index: php4/ext/standard/fsock.c
diff -u php4/ext/standard/fsock.c:1.51 php4/ext/standard/fsock.c:1.52
--- php4/ext/standard/fsock.c:1.51 Mon Jun 19 02:02:48 2000
+++ php4/ext/standard/fsock.c Sat Aug 26 21:14:47 2000
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: fsock.c,v 1.51 2000/06/19 09:02:48 thies Exp $ */
+/* $Id: fsock.c,v 1.52 2000/08/27 04:14:47 andi Exp $ */
/* Synced with php 3.0 revision 1.121 1999-06-18 [ssb] */
/* Synced with php 3.0 revision 1.133 1999-07-21 [sas] */
@@ -307,9 +307,9 @@
RETURN_FALSE;
}
- memset(&unix_addr,(char)0,sizeof(unix_addr));
+ memset(&unix_addr, (char)0, sizeof(unix_addr));
unix_addr.sun_family = AF_UNIX;
- strcpy(unix_addr.sun_path, (*args[0])->value.str.val);
+ strlcpy(unix_addr.sun_path, (*args[0])->value.str.val, sizeof(unix_addr.sun_path));
if (connect_nonb(socketd, (struct sockaddr *) &unix_addr, sizeof(unix_addr), &timeout) ==
SOCK_CONN_ERR) {
CLOSE_SOCK(1);