clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-24 11:27:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add some error checking when stream converters are instantiated.

Browse Source 
Use the global conversion error handlers for output conversion (for now)
We may want to make this customizable on a per-stream basis
via context param later on...
This commit is contained in:
Sara Golemon 2006-03-24 00:19:39 +00:00
parent b2b921a10f
commit eb44e642b1
1 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
main/streams/streams.c
View File

@ -2205,11 +2205,45 @@ PHPAPI php_stream *_php_stream_open_wrapper_ex(char *path, char *mode, int optio
UErrorCode status = U_ZERO_ERROR;
stream->output_encoding = ucnv_open(encoding, &status);
switch (U_FAILURE(status)) {
case U_ZERO_ERROR:
/* UTODO: (Maybe?) Allow overriding the default error handlers on a per-stream basis via context params */
zend_set_converter_error_mode(stream->output_encoding, UG(from_u_error_mode));
zend_set_converter_subst_char(stream->output_encoding, UG(subst_char), UG(subst_char_len));
break;
case U_MEMORY_ALLOCATION_ERROR:
php_stream_wrapper_log_error(wrapper, options ^ REPORT_ERRORS TSRMLS_CC,
"Unable to allocate memory for unicode output converter: %s", encoding);
break;
case U_FILE_ACCESS_ERROR:
php_stream_wrapper_log_error(wrapper, options ^ REPORT_ERRORS TSRMLS_CC,
"Error loading unicode output converter: %s", encoding);
break;
default:
php_stream_wrapper_log_error(wrapper, options ^ REPORT_ERRORS TSRMLS_CC,
"Unknown error starting unicode output converter: %s", encoding);
}
}
if (strchr(implicit_mode, 'r') || strchr(implicit_mode, '+')) {
char *encoding = (context && context->input_encoding) ? context->input_encoding : "utf8";
UErrorCode status = U_ZERO_ERROR;
stream->input_encoding = ucnv_open(encoding, &status);
switch (U_FAILURE(status)) {
case U_ZERO_ERROR:
/* UTODO: If/When Input error handling gets implemented, set the options here */
break;
case U_MEMORY_ALLOCATION_ERROR:
php_stream_wrapper_log_error(wrapper, options ^ REPORT_ERRORS TSRMLS_CC,
"Unable to allocate memory for unicode input converter: %s", encoding);
break;
case U_FILE_ACCESS_ERROR:
php_stream_wrapper_log_error(wrapper, options ^ REPORT_ERRORS TSRMLS_CC,
"Error loading unicode input converter: %s", encoding);
break;
default:
php_stream_wrapper_log_error(wrapper, options ^ REPORT_ERRORS TSRMLS_CC,
"Unknown error starting unicode input converter: %s", encoding);
}
}
}