Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Bug #1728403: Fix a bug that CJKCodecs StreamReader hangs when it 

reads a file that ends with incomplete sequence and sizehint argument
for .read() is specified.
This commit is contained in:
Hye-Shik Chang 2007-06-05 18:58:51 +00:00
parent 82958f0d3b
commit 9b5414090b
3 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Lib/test/test_multibytecodec.py
View File

@ -136,11 +136,19 @@ class Test_IncrementalDecoder(unittest.TestCase):
self.assertRaises(UnicodeDecodeError, decoder.decode, '', True) self.assertRaises(UnicodeDecodeError, decoder.decode, '', True)
self.assertEqual(decoder.decode('B@$'), u'\u4e16') self.assertEqual(decoder.decode('B@$'), u'\u4e16')
class Test_StreamReader(unittest.TestCase):
def test_bug1728403(self):
try:
open(TESTFN, 'w').write('\xa1')
f = codecs.open(TESTFN, encoding='cp949')
self.assertRaises(UnicodeDecodeError, f.read, 2)
finally:
os.unlink(TESTFN)
class Test_StreamWriter(unittest.TestCase): class Test_StreamWriter(unittest.TestCase):
if len(u'\U00012345') == 2: # UCS2 if len(u'\U00012345') == 2: # UCS2
def test_gb18030(self): def test_gb18030(self):
s= StringIO.StringIO() s = StringIO.StringIO()
c = codecs.getwriter('gb18030')(s) c = codecs.getwriter('gb18030')(s)
c.write(u'123') c.write(u'123')
self.assertEqual(s.getvalue(), '123') self.assertEqual(s.getvalue(), '123')

4
Misc/NEWS
View File

@ -222,6 +222,10 @@ Core and builtins
Library Library
------- -------
- Bug #1728403: Fix a bug that CJKCodecs StreamReader hangs when it
reads a file that ends with incomplete sequence and sizehint argument
for .read() is specified.
- Bug #1730389: Change time.strptime() to use ``\s+`` instead of ``\s*`` when - Bug #1730389: Change time.strptime() to use ``\s+`` instead of ``\s*`` when
matching spaces in the specified format argument. matching spaces in the specified format argument.

6
Modules/cjkcodecs/multibytecodec.c
View File

@ -1214,6 +1214,8 @@ mbstreamreader_iread(MultibyteStreamReaderObject *self,
cres = NULL; cres = NULL;
for (;;) { for (;;) {
int endoffile;
if (sizehint < 0) if (sizehint < 0)
cres = PyObject_CallMethod(self->stream, cres = PyObject_CallMethod(self->stream,
(char *)method, NULL); (char *)method, NULL);
@ -1230,6 +1232,8 @@ mbstreamreader_iread(MultibyteStreamReaderObject *self,
goto errorexit; goto errorexit;
} }
endoffile = (PyString_GET_SIZE(cres) == 0);
if (self->pendingsize > 0) { if (self->pendingsize > 0) {
PyObject *ctr; PyObject *ctr;
char *ctrdata; char *ctrdata;
@ -1257,7 +1261,7 @@ mbstreamreader_iread(MultibyteStreamReaderObject *self,
(MultibyteStatefulDecoderContext *)self, &buf)) (MultibyteStatefulDecoderContext *)self, &buf))
goto errorexit; goto errorexit;
if (rsize == 0 || sizehint < 0) { /* end of file */ if (endoffile || sizehint < 0) {
if (buf.inbuf < buf.inbuf_end && if (buf.inbuf < buf.inbuf_end &&
multibytecodec_decerror(self->codec, &self->state, multibytecodec_decerror(self->codec, &self->state,
&buf, self->errors, MBERR_TOOFEW)) &buf, self->errors, MBERR_TOOFEW))