diff options
| author | Ilia Alshanetsky <iliaa@php.net> | 2004-05-16 15:34:56 +0000 |
|---|---|---|
| committer | Ilia Alshanetsky <iliaa@php.net> | 2004-05-16 15:34:56 +0000 |
| commit | 5eaf82b6eb0871b9f9ef2416040985abb79c24bd (patch) | |
| tree | 093330ffaa6185a8c89f51e10650d56f92db8239 | |
| parent | f93672da8ed66fa4c1548410844c77f285ad45d2 (diff) | |
| download | php-git-5eaf82b6eb0871b9f9ef2416040985abb79c24bd.tar.gz | |
MFH: Do not allocate error buffer at the start of every request.
| -rw-r--r-- | ext/sockets/sockets.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/ext/sockets/sockets.c b/ext/sockets/sockets.c index 419b55fea2..7a663f87ff 100644 --- a/ext/sockets/sockets.c +++ b/ext/sockets/sockets.c @@ -350,7 +350,7 @@ static char *php_strerror(int error TSRMLS_DC) buf = hstrerror(error); #else { - sprintf(SOCKETS_G(strerror_buf), "Host lookup error %d", error); + spprintf(&(SOCKETS_G(strerror_buf), "Host lookup error %d", error); buf = SOCKETS_G(strerror_buf); } #endif @@ -364,7 +364,7 @@ static char *php_strerror(int error TSRMLS_DC) if (FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, error, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPTSTR) &tmp, 0, NULL)) { - strlcpy(SOCKETS_G(strerror_buf), (char *) tmp, 10000); + SOCKETS_G(strerror_buf) = estrndup(tmp); LocalFree(tmp); buf = SOCKETS_G(strerror_buf); @@ -483,18 +483,18 @@ PHP_MINFO_FUNCTION(sockets) /* {{{ PHP_RINIT_FUNCTION */ PHP_RINIT_FUNCTION(sockets) { - if ((SOCKETS_G(strerror_buf) = emalloc(16384))) - return SUCCESS; - - return FAILURE; + return SUCCESS; } /* }}} */ /* {{{ PHP_RSHUTDOWN_FUNCTION */ PHP_RSHUTDOWN_FUNCTION(sockets) { - efree(SOCKETS_G(strerror_buf)); - + if (SOCKETS_G(strerror_buf)) { + efree(SOCKETS_G(strerror_buf)); + SOCKETS_G(strerror_buf) = NULL; + } + return SUCCESS; } /* }}} */ |