Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 33 additions & 0 deletions Lib/test/test_capi/test_unicode.py
Original file line number Diff line number Diff line change
Expand Up @@ -2075,6 +2075,39 @@ def test_detect_overflow(self):
# strategy which depends on the operating system
self.assertIn(f'at position '.encode(), proc.err)

@support.nomemtest
def test_memory_error(self):
# Inject MemoryError in PyUnicodeWriter_WriteStr()
writer = self.create_writer(0)
writer.write_str("start")
with self.assertRaises(MemoryError):
with support.inject_memory_error_cm():
# Resize the internal str object
writer.write_str("s" * 1024)
writer.write_str(" end")
self.assertEqual(writer.finish(), "start end")

# Inject MemoryError in PyUnicodeWriter_Finish()
writer = self.create_writer(1024)
writer.write_str("abc")
with self.assertRaises(MemoryError):
with support.inject_memory_error_cm():
# Need to truncate the internal str object
writer.finish()

def test_change_kind(self):
writer = self.create_writer(0)
# Create an ASCII buffer
writer.write_str('ascii ')
# Change the buffer to UCS1
writer.write_str('latin1:\xe9 ')
# Change the buffer to UCS2
writer.write_str('ucs2:\u20ac ')
# Change the buffer to UCS4
writer.write_str('ucs4:\U0010ffff')
self.assertEqual(writer.finish(),
'ascii latin1:\xe9 ucs2:\u20ac ucs4:\U0010ffff')


# Test PyUnicodeWriter_Format()
@unittest.skipIf(ctypes is None, 'need ctypes')
Expand Down
3 changes: 3 additions & 0 deletions Objects/unicode_writer.c
Original file line number Diff line number Diff line change
Expand Up @@ -199,10 +199,13 @@ void PyUnicodeWriter_Discard(PyUnicodeWriter *writer)
void
_PyUnicodeWriter_InitWithBuffer(_PyUnicodeWriter *writer, PyObject *buffer)
{
assert(PyUnstable_Object_IsUniquelyReferenced(buffer));

memset(writer, 0, sizeof(*writer));
writer->buffer = buffer;
_PyUnicodeWriter_Update(writer);
writer->min_length = writer->size;
assert(_PyUnicodeWriter_CanWrite(writer));
}


Expand Down
Loading