summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Dowad <alexinbeijing@gmail.com>2021-01-05 15:44:31 +0200
committerAlex Dowad <alexinbeijing@gmail.com>2021-01-14 22:26:24 +0200
commit40384da36a1505527fe3c99b731ec62e6922f6ac (patch)
tree48ad8af7a0c5732ba25277b6a3e73969b8f66571
parentc11e12ffe001dd7f4a57c39a8ebd5de48a72cb42 (diff)
downloadphp-git-40384da36a1505527fe3c99b731ec62e6922f6ac.tar.gz
JIS7/JIS8 encoding: treat unrecognized escapes as error
-rw-r--r--ext/mbstring/libmbfl/filters/mbfilter_jis.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/ext/mbstring/libmbfl/filters/mbfilter_jis.c b/ext/mbstring/libmbfl/filters/mbfilter_jis.c
index 15c1bb30a1..2eeae28f82 100644
--- a/ext/mbstring/libmbfl/filters/mbfilter_jis.c
+++ b/ext/mbstring/libmbfl/filters/mbfilter_jis.c
@@ -195,7 +195,7 @@ retry:
filter->status += 3;
} else {
filter->status &= ~0xf;
- CK((*filter->output_function)(0x1b, filter->data));
+ CK((*filter->output_function)(0x1b | MBFL_WCSGROUP_THROUGH, filter->data));
goto retry;
}
break;
@@ -213,7 +213,7 @@ retry:
filter->status++;
} else {
filter->status &= ~0xf;
- CK((*filter->output_function)(0x1b, filter->data));
+ CK((*filter->output_function)(0x1b | MBFL_WCSGROUP_THROUGH, filter->data));
CK((*filter->output_function)(0x24, filter->data));
goto retry;
}
@@ -232,7 +232,7 @@ retry:
filter->status = 0x90;
} else {
filter->status &= ~0xf;
- CK((*filter->output_function)(0x1b, filter->data));
+ CK((*filter->output_function)(0x1b | MBFL_WCSGROUP_THROUGH, filter->data));
CK((*filter->output_function)(0x24, filter->data));
CK((*filter->output_function)(0x28, filter->data));
goto retry;
@@ -254,7 +254,7 @@ retry:
filter->status = 0x20;
} else {
filter->status &= ~0xf;
- CK((*filter->output_function)(0x1b, filter->data));
+ CK((*filter->output_function)(0x1b | MBFL_WCSGROUP_THROUGH, filter->data));
CK((*filter->output_function)(0x28, filter->data));
goto retry;
}