From: Ilia Alshanetsky <iliaa@php.net>
Date: Sat, 19 May 2007 17:52:30 +0000 (+0000)
Subject: Avoid strlen()
X-Git-Tag: php-5.2.3RC1~48
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c8a694eb4574e4e7d71d5836b8dc87ee95b6c08b;p=php

Avoid strlen()
---

diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c
index 398952a2c5..3c2f447416 100644
--- a/ext/iconv/iconv.c
+++ b/ext/iconv/iconv.c
@@ -2305,8 +2305,8 @@ PHP_FUNCTION(ob_iconv_handler)
 				ICONVG(output_encoding), ICONVG(internal_encoding));
 		_php_iconv_show_error(err, ICONVG(output_encoding), ICONVG(internal_encoding) TSRMLS_CC);
 		if (out_buffer != NULL) {
-			spprintf(&content_type, 0, "Content-Type:%s; charset=%s", mimetype, ICONVG(output_encoding));
-			if (content_type && sapi_add_header(content_type, strlen(content_type), 0) != FAILURE) {
+			int len = spprintf(&content_type, 0, "Content-Type:%s; charset=%s", mimetype, ICONVG(output_encoding));
+			if (content_type && sapi_add_header(content_type, len, 0) != FAILURE) {
 				SG(sapi_headers).send_default_content_type = 0;
 			}
 			if (mimetype_alloced) {