diff options
| author | Philip Jenvey <pjenvey@underboss.org> | 2012-10-26 17:01:53 -0700 |
|---|---|---|
| committer | Philip Jenvey <pjenvey@underboss.org> | 2012-10-26 17:01:53 -0700 |
| commit | e902add6be61431495763fccb8f9867c9b50b3d1 (patch) | |
| tree | f6a9de892e6c1166fee604c67ee6a2435236f67a /Python/codecs.c | |
| parent | 03edcad74e4aa1f126e6141b31b8d50c04521bd9 (diff) | |
| download | cpython-e902add6be61431495763fccb8f9867c9b50b3d1.tar.gz | |
bounds check for bad data (thanks amaury)
Diffstat (limited to 'Python/codecs.c')
| -rw-r--r-- | Python/codecs.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Python/codecs.c b/Python/codecs.c index c7f4a9cbc1..90f1cf6ad0 100644 --- a/Python/codecs.c +++ b/Python/codecs.c @@ -821,9 +821,10 @@ PyCodec_SurrogatePassErrors(PyObject *exc) /* Try decoding a single surrogate character. If there are more, let the codec call us again. */ p += start; - if ((p[0] & 0xf0) == 0xe0 || - (p[1] & 0xc0) == 0x80 || - (p[2] & 0xc0) == 0x80) { + if (strlen(p) > 2 && + ((p[0] & 0xf0) == 0xe0 || + (p[1] & 0xc0) == 0x80 || + (p[2] & 0xc0) == 0x80)) { /* it's a three-byte code */ ch = ((p[0] & 0x0f) << 12) + ((p[1] & 0x3f) << 6) + (p[2] & 0x3f); if (ch < 0xd800 || ch > 0xdfff) |