minor improvements

diff --git a/ext/ereg/ereg.c b/ext/ereg/ereg.c
index a9ebaaee88923b8f1b2b10a878521aead0678f6a..952a9cee3531b5d3fe4bbe7faee2121f1c028271 100644 (file)
--- 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 60d762389499ad31e1cb7c0348ec7824b1eb4a5f..417f841727bbd7a6b3677e7043fd44b0711bc187 100644 (file)
--- a/ext/sockets/sockets.c
+++ b/ext/sockets/sockets.c
@@ -1627,11 +1627,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 a9ebaaee88923b8f1b2b10a878521aead0678f6a..952a9cee3531b5d3fe4bbe7faee2121f1c028271 100644 (file)
--- 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);
                }
        }