cvs: php4 /ext/standard fsock.c
| From: | Sascha Schumann | Date: | Fri, 03 Aug 2001 09:36:15 +0000 |
| Subject: | cvs: php4 /ext/standard fsock.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-6506@lists.php.net to get a copy of this message | ||
sas Fri Aug 3 05:36:15 2001 EDT
Modified files:
/php4/ext/standard fsock.c
Log:
Fix a possible segfault (Thanks to Sebastian for catching it)
Index: php4/ext/standard/fsock.c
diff -u php4/ext/standard/fsock.c:1.74 php4/ext/standard/fsock.c:1.75
--- php4/ext/standard/fsock.c:1.74 Mon Jul 30 04:24:36 2001
+++ php4/ext/standard/fsock.c Fri Aug 3 05:36:14 2001
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: fsock.c,v 1.74 2001/07/30 08:24:36 zeev Exp $ */
+/* $Id: fsock.c,v 1.75 2001/08/03 09:36:14 sas 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] */
@@ -89,9 +89,16 @@
efree(key); \
}
-#define SEARCHCR() do { \
- for (p = READPTR(sock), pe = p + MIN(TOREAD(sock), maxlen); \
- *p != '\n'; ) if (++p >= pe) { p = NULL; break; } \
+#define SEARCHCR() do { \
+ if (TOREAD(sock)) { \
+ for (p = READPTR(sock), pe = p + MIN(TOREAD(sock), maxlen); \
+ *p != '\n'; ) \
+ if (++p >= pe) { \
+ p = NULL; \
+ break; \
+ } \
+ } else \
+ p = NULL; \
} while (0)
#ifdef PHP_WIN32