summaryrefslogtreecommitdiffstats
path: root/contrib/tools/python3/Modules/cjkcodecs/_codecs_jp.c
diff options
context:
space:
mode:
Diffstat (limited to 'contrib/tools/python3/Modules/cjkcodecs/_codecs_jp.c')
-rw-r--r--contrib/tools/python3/Modules/cjkcodecs/_codecs_jp.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/contrib/tools/python3/Modules/cjkcodecs/_codecs_jp.c b/contrib/tools/python3/Modules/cjkcodecs/_codecs_jp.c
index f7127487aa5..cd77888d551 100644
--- a/contrib/tools/python3/Modules/cjkcodecs/_codecs_jp.c
+++ b/contrib/tools/python3/Modules/cjkcodecs/_codecs_jp.c
@@ -192,8 +192,11 @@ ENCODER(euc_jis_2004)
JISX0213_ENCPAIRS);
if (code == DBCINV)
return 1;
- } else
+ }
+ else if (c2 != 0) {
+ /* Don't consume null char as part of pair */
insize = 2;
+ }
}
}
}
@@ -611,8 +614,10 @@ ENCODER(shift_jis_2004)
if (code == DBCINV)
return 1;
}
- else
+ else if (ch2 != 0) {
+ /* Don't consume null char as part of pair */
insize = 2;
+ }
}
}
}