mirror of
https://github.com/python/cpython.git
synced 2025-08-04 08:59:19 +00:00
Vladimir Marangozov's long-awaited malloc restructuring.
For more comments, read the patches@python.org archives. For documentation read the comments in mymalloc.h and objimpl.h. (This is not exactly what Vladimir posted to the patches list; I've made a few changes, and Vladimir sent me a fix in private email for a problem that only occurs in debug mode. I'm also holding back on his change to main.c, which seems unnecessary to me.)
This commit is contained in:
parent
2808b744e8
commit
b18618dab7
73 changed files with 658 additions and 407 deletions
|
@ -514,17 +514,17 @@ r_object(p)
|
|||
PyErr_SetString(PyExc_ValueError, "bad marshal data");
|
||||
return NULL;
|
||||
}
|
||||
buffer = (char *)Py_Malloc(n);
|
||||
buffer = PyMem_NEW(char, n);
|
||||
if (buffer == NULL)
|
||||
return NULL;
|
||||
return PyErr_NoMemory();
|
||||
if (r_string(buffer, (int)n, p) != n) {
|
||||
free(buffer);
|
||||
PyMem_DEL(buffer);
|
||||
PyErr_SetString(PyExc_EOFError,
|
||||
"EOF read where object expected");
|
||||
return NULL;
|
||||
}
|
||||
v = PyUnicode_DecodeUTF8(buffer, n, NULL);
|
||||
free(buffer);
|
||||
PyMem_DEL(buffer);
|
||||
return v;
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue