diff options
| author | Sascha Schumann <sas@php.net> | 2002-06-26 07:54:50 +0000 |
|---|---|---|
| committer | Sascha Schumann <sas@php.net> | 2002-06-26 07:54:50 +0000 |
| commit | ee477dbc56997b5233e5d69db77e710de5821358 (patch) | |
| tree | ae7b202a4c0034a7fe272d9d42bdedffb59f77fa | |
| parent | f57306cdd961ae630fb17903cc5b960cf2628102 (diff) | |
| download | php-git-ee477dbc56997b5233e5d69db77e710de5821358.tar.gz | |
Fix code which makes wrong assumptions about the return value of snprintf.
The AOLserver module did not use the return value, so simply drop it.
| -rw-r--r-- | ext/interbase/interbase.c | 5 | ||||
| -rw-r--r-- | sapi/aolserver/aolserver.c | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/ext/interbase/interbase.c b/ext/interbase/interbase.c index ff951fe80d..8e4c9a3e51 100644 --- a/ext/interbase/interbase.c +++ b/ext/interbase/interbase.c @@ -285,13 +285,12 @@ static void _php_ibase_error(void) static void _php_ibase_module_error(char *msg, ...) { va_list ap; - int len; TSRMLS_FETCH(); va_start(ap, msg); - len = vsnprintf(IBG(errmsg), MAX_ERRMSG - 1, msg, ap); + /* vsnprintf NUL terminates the buf and writes at most n-1 chars+NUL */ + vsnprintf(IBG(errmsg), MAX_ERRMSG, msg, ap); va_end(ap); - IBG(errmsg[len]) = '\0'; php_error(E_WARNING, "InterBase module: %s", IBG(errmsg)); } diff --git a/sapi/aolserver/aolserver.c b/sapi/aolserver/aolserver.c index d33918f55a..0ce52e4c00 100644 --- a/sapi/aolserver/aolserver.c +++ b/sapi/aolserver/aolserver.c @@ -310,9 +310,9 @@ php_ns_sapi_register_variables(zval *track_vars_array TSRMLS_DC) char *value = Ns_SetValue(NSG(conn->headers), i); char *p; char c; - int buf_len; - buf_len = snprintf(buf, NS_BUF_SIZE, "HTTP_%s", key); + snprintf(buf, NS_BUF_SIZE, "HTTP_%s", key); + for(p = buf + 5; (c = *p); p++) { c = toupper(c); if(c < 'A' || c > 'Z') { |