ilusha/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython synced 2026-09-29 08:45:29 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 3.3.

Browse source
This commit is contained in:
Stefan Krah 2012-11-02 17:55:11 +01:00
commit c38c816ea1
3 changed files with 38 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Objects/memoryobject.c
View file

@ -2707,6 +2707,8 @@ memory_hash(PyMemoryViewObject *self)
if (self->hash == -1) {
Py_buffer *view = &self->view;
char *mem = view->buf;
Py_ssize_t ret;
char fmt;
CHECK_RELEASED_INT(self);
@ -2715,6 +2717,12 @@ memory_hash(PyMemoryViewObject *self)
"cannot hash writable memoryview object");
return -1;
}
ret = get_native_fmtchar(&fmt, view->format);
if (ret < 0 || !IS_BYTE_FORMAT(fmt)) {
PyErr_SetString(PyExc_ValueError,
"memoryview: hashing is restricted to formats 'B', 'b' or 'c'");
return -1;
}
if (view->obj != NULL && PyObject_Hash(view->obj) == -1) {
/* Keep the original error message */
return -1;