moriyoshi Wed Mar 23 18:06:38 2005 EDT
Modified files:
/php-src/ext/iconv iconv.c
Log:
- Add sanity check in iconv_mime_encode(). Leaving the third parameter
unspecified would yield bus error.
http://cvs.php.net/diff.php/php-src/ext/iconv/iconv.c?r1=1.121&r2=1.122&ty=u
Index: php-src/ext/iconv/iconv.c
diff -u php-src/ext/iconv/iconv.c:1.121 php-src/ext/iconv/iconv.c:1.122
--- php-src/ext/iconv/iconv.c:1.121 Tue Nov 23 04:44:54 2004
+++ php-src/ext/iconv/iconv.c Wed Mar 23 18:06:38 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: iconv.c,v 1.121 2004/11/23 09:44:54 derick Exp $ */
+/* $Id: iconv.c,v 1.122 2005/03/23 23:06:38 moriyoshi Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1909,24 +1909,20 @@
Composes a mime header field with field_name and field_value in a specified
scheme */
PHP_FUNCTION(iconv_mime_encode)
{
- char *field_name;
+ const char *field_name = NULL;
int field_name_len;
- char *field_value;
+ const char *field_value = NULL;
int field_value_len;
- zval *pref;
- zval val, *pval, **ppval;
- char *in_charset;
- char *out_charset;
- long line_len = 76;
- zval lfchars;
-
- php_iconv_enc_scheme_t scheme_id = PHP_ICONV_ENC_SCHEME_BASE64;
-
+ zval *pref = NULL;
+ zval tmp_zv, *tmp_zv_p = NULL;
smart_str retval = {0};
-
php_iconv_err_t err;
- in_charset = ICONVG(internal_encoding);
+ const char *in_charset = ICONVG(internal_encoding);
+ const char *out_charset = in_charset;
+ long line_len = 76;
+ const char *lfchars = "\r\n";
+ php_iconv_enc_scheme_t scheme_id = PHP_ICONV_ENC_SCHEME_BASE64;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|a",
&field_name, &field_name_len, &field_value, &field_value_len,
@@ -1935,65 +1931,70 @@
RETURN_FALSE;
}
- if (zend_hash_find(Z_ARRVAL_P(pref), "scheme", sizeof("scheme"), (void
**)&ppval) == SUCCESS) {
- if (Z_TYPE_PP(ppval) == IS_STRING && Z_STRLEN_PP(ppval) > 0) {
- switch (Z_STRVAL_PP(ppval)[0]) {
- case 'B': case 'b':
- scheme_id = PHP_ICONV_ENC_SCHEME_BASE64;
- break;
+ if (pref != NULL) {
+ zval **ppval;
- case 'Q': case 'q':
- scheme_id = PHP_ICONV_ENC_SCHEME_QPRINT;
- break;
+ if (zend_hash_find(Z_ARRVAL_P(pref), "scheme",
sizeof("scheme"), (void **)&ppval) == SUCCESS) {
+ if (Z_TYPE_PP(ppval) == IS_STRING && Z_STRLEN_PP(ppval)
> 0) {
+ switch (Z_STRVAL_PP(ppval)[0]) {
+ case 'B': case 'b':
+ scheme_id =
PHP_ICONV_ENC_SCHEME_BASE64;
+ break;
+
+ case 'Q': case 'q':
+ scheme_id =
PHP_ICONV_ENC_SCHEME_QPRINT;
+ break;
+ }
}
}
- }
-
- in_charset = ICONVG(internal_encoding);
- if (zend_hash_find(Z_ARRVAL_P(pref), "input-charset",
sizeof("input-charset"), (void **)&ppval) == SUCCESS) {
- if (Z_TYPE_PP(ppval) == IS_STRING && Z_STRLEN_PP(ppval) > 0) {
- in_charset = Z_STRVAL_PP(ppval);
+ if (zend_hash_find(Z_ARRVAL_P(pref), "input-charset",
sizeof("input-charset"), (void **)&ppval) == SUCCESS) {
+ if (Z_TYPE_PP(ppval) == IS_STRING && Z_STRLEN_PP(ppval)
> 0) {
+ in_charset = Z_STRVAL_PP(ppval);
+ }
}
- }
- out_charset = in_charset;
- if (zend_hash_find(Z_ARRVAL_P(pref), "output-charset",
sizeof("output-charset"), (void **)&ppval) == SUCCESS) {
- if (Z_TYPE_PP(ppval) == IS_STRING && Z_STRLEN_PP(ppval) > 0) {
- out_charset = Z_STRVAL_PP(ppval);
+ if (zend_hash_find(Z_ARRVAL_P(pref), "output-charset",
sizeof("output-charset"), (void **)&ppval) == SUCCESS) {
+ if (Z_TYPE_PP(ppval) == IS_STRING && Z_STRLEN_PP(ppval)
> 0) {
+ out_charset = Z_STRVAL_PP(ppval);
+ }
}
- }
- if (zend_hash_find(Z_ARRVAL_P(pref), "line-length",
sizeof("line-length"), (void **)&ppval) == SUCCESS) {
- pval = *ppval;
- if (Z_TYPE_P(pval) != IS_LONG) {
- val = *pval;
- zval_copy_ctor(&val);
- convert_to_long(&val);
- pval = &val;
- }
+ if (zend_hash_find(Z_ARRVAL_P(pref), "line-length",
sizeof("line-length"), (void **)&ppval) == SUCCESS) {
+ zval val, *pval = *ppval;
+
+ if (Z_TYPE_P(pval) != IS_LONG) {
+ val = *pval;
+ zval_copy_ctor(&val);
+ convert_to_long(&val);
+ pval = &val;
+ }
- line_len = Z_LVAL_P(pval);
+ line_len = Z_LVAL_P(pval);
- if (pval == &val) {
- zval_dtor(&val);
+ if (pval == &val) {
+ zval_dtor(&val);
+ }
}
- }
- if (zend_hash_find(Z_ARRVAL_P(pref), "line-break-chars",
sizeof("line-break-chars"), (void **)&ppval) == SUCCESS) {
- lfchars = **ppval;
- zval_copy_ctor(&lfchars);
+ if (zend_hash_find(Z_ARRVAL_P(pref), "line-break-chars",
sizeof("line-break-chars"), (void **)&ppval) == SUCCESS) {
+ if (Z_TYPE_PP(ppval) != IS_STRING) {
+ tmp_zv = **ppval;
+ zval_copy_ctor(&tmp_zv);
+ convert_to_string(&tmp_zv);
- if (Z_TYPE(lfchars) != IS_STRING) {
- convert_to_string(&lfchars);
+ lfchars = Z_STRVAL(tmp_zv);
+
+ tmp_zv_p = &tmp_zv;
+ } else {
+ lfchars = Z_STRVAL_PP(ppval);
+ }
}
- } else {
- ZVAL_STRING(&lfchars, "\r\n", 1);
}
err = _php_iconv_mime_encode(&retval, field_name, field_name_len,
- field_value, field_value_len, line_len, Z_STRVAL(lfchars),
scheme_id,
+ field_value, field_value_len, line_len, lfchars, scheme_id,
out_charset, in_charset);
_php_iconv_show_error(err, out_charset, in_charset TSRMLS_CC);
@@ -2008,7 +2009,9 @@
RETVAL_FALSE;
}
- zval_dtor(&lfchars);
+ if (tmp_zv_p != NULL) {
+ zval_dtor(tmp_zv_p);
+ }
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
