From: Sascha Schumann <sas@php.net>
Date: Wed, 26 Jun 2002 07:54:50 +0000 (+0000)
Subject: Fix code which makes wrong assumptions about the return value of snprintf.
X-Git-Tag: php-4.3.0dev_zend2_alpha2~83
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ee477dbc56997b5233e5d69db77e710de5821358;p=php

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.
---

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') {