diff options
| author | Anatol Belski <ab@php.net> | 2016-06-06 07:33:36 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2016-06-06 07:33:36 +0200 |
| commit | 6ec8b2c57d7b811950c4636436e396e0f80d4678 (patch) | |
| tree | ec3969ecf323638c1d04617a471f9a945e880e54 | |
| parent | 1f7535234ea4c036bc9f94617daa3a8d0a2b1192 (diff) | |
| parent | c05b417718d05831987b90d4c4651438a8eaefe4 (diff) | |
| download | php-git-6ec8b2c57d7b811950c4636436e396e0f80d4678.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
missing return
| -rw-r--r-- | ext/mbstring/libmbfl/filters/mbfilter_sjis_2004.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ext/mbstring/libmbfl/filters/mbfilter_sjis_2004.c b/ext/mbstring/libmbfl/filters/mbfilter_sjis_2004.c index d02e5e6421..4f146cebea 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_sjis_2004.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_sjis_2004.c @@ -672,6 +672,8 @@ retry: CK(mbfl_filt_conv_illegal_output(c, filter)); } } + + return c; } int |