diff options
| author | Rui Hirokawa <hirokawa@php.net> | 2011-08-03 11:51:08 +0000 |
|---|---|---|
| committer | Rui Hirokawa <hirokawa@php.net> | 2011-08-03 11:51:08 +0000 |
| commit | 1735305f34cce831e5932da0cfc401f87fa15b17 (patch) | |
| tree | 73b427da85ae613e5f0d2126561618104b52b2c8 /ext/mbstring/libmbfl | |
| parent | 1a5b1da9c103f41aa45fb79182bd938a6adbc1c8 (diff) | |
| download | php-git-1735305f34cce831e5932da0cfc401f87fa15b17.tar.gz | |
fixed error handling on SJIS_Mobile.
Diffstat (limited to 'ext/mbstring/libmbfl')
| -rw-r--r-- | ext/mbstring/libmbfl/filters/mbfilter_sjis_mobile.c | 19 | ||||
| -rw-r--r-- | ext/mbstring/libmbfl/filters/mbfilter_sjis_mobile.h | 1 |
2 files changed, 19 insertions, 1 deletions
diff --git a/ext/mbstring/libmbfl/filters/mbfilter_sjis_mobile.c b/ext/mbstring/libmbfl/filters/mbfilter_sjis_mobile.c index 62cb186f9f..e2e59c502d 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_sjis_mobile.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_sjis_mobile.c @@ -139,7 +139,7 @@ const struct mbfl_convert_vtbl vtbl_wchar_sjis_docomo = { mbfl_filt_conv_common_ctor, mbfl_filt_conv_common_dtor, mbfl_filt_conv_wchar_sjis_mobile, - mbfl_filt_conv_common_flush + mbfl_filt_conv_sjis_mobile_flush }; const struct mbfl_convert_vtbl vtbl_sjis_kddi_wchar = { @@ -1080,6 +1080,23 @@ mbfl_filt_conv_wchar_sjis_mobile(int c, mbfl_convert_filter *filter) return c; } +int +mbfl_filt_conv_sjis_mobile_flush(mbfl_convert_filter *filter) +{ + int c1 = filter->cache; + if (filter->status == 1 && (c1 == 0x0023 || (c1 >= 0x0030 && c1<=0x0039))) { + CK((*filter->output_function)(c1, filter->data)); + } + filter->status = 0; + filter->cache = 0; + + if (filter->flush_function != NULL) { + return (*filter->flush_function)(filter->data); + } + + return 0; +} + static int mbfl_filt_ident_sjis_mobile(int c, mbfl_identify_filter *filter) { if (filter->status) { /* kanji second char */ diff --git a/ext/mbstring/libmbfl/filters/mbfilter_sjis_mobile.h b/ext/mbstring/libmbfl/filters/mbfilter_sjis_mobile.h index 405577ca89..bf504ff3b3 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_sjis_mobile.h +++ b/ext/mbstring/libmbfl/filters/mbfilter_sjis_mobile.h @@ -60,5 +60,6 @@ extern const struct mbfl_convert_vtbl vtbl_wchar_sjis_sb_pua; int mbfl_filt_conv_sjis_mobile_wchar(int c, mbfl_convert_filter *filter); int mbfl_filt_conv_wchar_sjis_mobile(int c, mbfl_convert_filter *filter); +int mbfl_filt_conv_sjis_mobile_flush(mbfl_convert_filter *filter); #endif /* MBFL_MBFILTER_SJIS_MOBILE_H */ |