From: Antony Dovgal <tony2001@php.net>
Date: Thu, 28 Dec 2006 14:17:38 +0000 (+0000)
Subject: MFH
X-Git-Tag: php-5.2.1RC2~47
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fdfa4033883231e3f9327c66b78e0f30046d67ec;p=php

MFH
---

diff --git a/ext/ereg/ereg.c b/ext/ereg/ereg.c
index 3e48d39ab3..3408e77212 100644
--- a/ext/ereg/ereg.c
+++ b/ext/ereg/ereg.c
@@ -425,7 +425,7 @@ PHPAPI char *php_reg_replace(const char *pattern, const char *replace, const cha
 				buf = nbuf;
 			}
 			/* stick that last bit of string on our output */
-			strcat(buf, &string[pos]);
+			strlcat(buf, &string[pos], buf_len);
 		}
 	}
 
diff --git a/ext/sockets/sockets.c b/ext/sockets/sockets.c
index db08598cbc..23caf9556c 100644
--- a/ext/sockets/sockets.c
+++ b/ext/sockets/sockets.c
@@ -1600,11 +1600,12 @@ PHP_FUNCTION(socket_set_option)
 {
 	zval			*arg1, **arg4;
 	struct linger	lv;
-	struct timeval tv;
 	php_socket		*php_sock;
 	int				ov, optlen, retval; 
 #ifdef PHP_WIN32
 	int				timeout;
+#else 
+	struct timeval tv;
 #endif
 	long				level, optname;
 	void 			*opt_ptr;
diff --git a/ext/standard/reg.c b/ext/standard/reg.c
index 3e48d39ab3..3408e77212 100644
--- a/ext/standard/reg.c
+++ b/ext/standard/reg.c
@@ -425,7 +425,7 @@ PHPAPI char *php_reg_replace(const char *pattern, const char *replace, const cha
 				buf = nbuf;
 			}
 			/* stick that last bit of string on our output */
-			strcat(buf, &string[pos]);
+			strlcat(buf, &string[pos], buf_len);
 		}
 	}