From 3227af454cd14d3843b11ab7609cd1b06e87a6af Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Wed, 29 Aug 2007 14:21:45 +0000 Subject: [PATCH] Refuse to compute digests from PyUnicode (str) instances. This breaks a few things that I'll patch up in a minute. --- Modules/_hashopenssl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Modules/_hashopenssl.c b/Modules/_hashopenssl.c index 9ee1b3db278..ad38cfdec12 100644 --- a/Modules/_hashopenssl.c +++ b/Modules/_hashopenssl.c @@ -153,12 +153,12 @@ EVP_hexdigest(EVPobject *self, PyObject *unused) } #define MY_GET_BUFFER_VIEW_OR_ERROUT(obj, viewp) do { \ - if (!PyObject_CheckBuffer((obj))) { \ + if (PyUnicode_Check(obj) || !PyObject_CheckBuffer((obj))) { \ PyErr_SetString(PyExc_TypeError, \ "object supporting the buffer API required"); \ return NULL; \ } \ - if (PyObject_GetBuffer((obj), (viewp), PyBUF_CHARACTER) == -1) { \ + if (PyObject_GetBuffer((obj), (viewp), PyBUF_SIMPLE) == -1) { \ return NULL; \ } \ if ((viewp)->ndim > 1) { \