fixed error handling on SJIS_Mobile.

diff --git a/ext/mbstring/libmbfl/filters/mbfilter_sjis_mobile.c b/ext/mbstring/libmbfl/filters/mbfilter_sjis_mobile.c
index 62cb186f9f957f71be3ebc1663d900c5b979ace2..e2e59c502de29e94157fccb69a7b5294b62fc954 100644 (file)
--- 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 405577ca8968692c177dbcfb1035d3f13c1bfde1..bf504ff3b3684d8abd5988f29782875fcb75586c 100644 (file)
--- 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 */