diff options
author | Kristján Valur Jónsson <kristjan@ccpgames.com> | 2009-03-03 03:20:42 +0000 |
---|---|---|
committer | Kristján Valur Jónsson <kristjan@ccpgames.com> | 2009-03-03 03:20:42 +0000 |
commit | 8bd25308f33c7ccc59b2eba4761321f672bd3f7f (patch) | |
tree | 1cd62b5007b23f8b63dcafcf05e5163bb6efcf8d /Modules/shamodule.c | |
parent | 3fd40613be93729ae5ee282d8eee27210ce8b223 (diff) | |
download | cpython-8bd25308f33c7ccc59b2eba4761321f672bd3f7f.tar.gz |
Fix SHA_new and MD5_new, that would crash if not given initial data
Diffstat (limited to 'Modules/shamodule.c')
-rw-r--r-- | Modules/shamodule.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/Modules/shamodule.c b/Modules/shamodule.c index e89a1eab0e..6399b752a5 100644 --- a/Modules/shamodule.c +++ b/Modules/shamodule.c @@ -548,10 +548,12 @@ SHA_new(PyObject *self, PyObject *args, PyObject *kwdict) return NULL; } - GET_BUFFER_VIEW_OR_ERROUT(data_obj, &view, NULL); + if (data_obj) + GET_BUFFER_VIEW_OR_ERROUT(data_obj, &view, NULL); if ((new = newSHAobject()) == NULL) { - PyBuffer_Release(&view); + if (data_obj) + PyBuffer_Release(&view); return NULL; } @@ -559,15 +561,16 @@ SHA_new(PyObject *self, PyObject *args, PyObject *kwdict) if (PyErr_Occurred()) { Py_DECREF(new); - PyBuffer_Release(&view); + if (data_obj) + PyBuffer_Release(&view); return NULL; } if (data_obj) { sha_update(new, (unsigned char*)view.buf, Py_SAFE_DOWNCAST(view.len, Py_ssize_t, unsigned int)); + PyBuffer_Release(&view); } - PyBuffer_Release(&view); return (PyObject *)new; } |