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 | 7705d0aaafb6b034e9a3582e57f77d8f9cb5aa91 (patch) | |
| tree | 3e75fadc1393ecf69f39ef7f032bd99127d6b065 /Modules/md5module.c | |
| parent | 7d49bba969a6ca490ade6aa908e350d3c05f76f4 (diff) | |
| download | cpython-git-7705d0aaafb6b034e9a3582e57f77d8f9cb5aa91.tar.gz | |
Fix SHA_new and MD5_new, that would crash if not given initial data
Diffstat (limited to 'Modules/md5module.c')
| -rw-r--r-- | Modules/md5module.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Modules/md5module.c b/Modules/md5module.c index 0b150a0bd2..7081706ba3 100644 --- a/Modules/md5module.c +++ b/Modules/md5module.c @@ -272,19 +272,21 @@ MD5_new(PyObject *self, PyObject *args) if (!PyArg_ParseTuple(args, "|O:new", &data_obj)) return NULL; - GET_BUFFER_VIEW_OR_ERROUT(data_obj, &view, NULL); + if (data_obj) + GET_BUFFER_VIEW_OR_ERROUT(data_obj, &view, NULL); if ((md5p = newmd5object()) == NULL) { - PyBuffer_Release(&view); + if (data_obj) + PyBuffer_Release(&view); return NULL; } if (data_obj) { md5_append(&md5p->md5, (unsigned char*)view.buf, Py_SAFE_DOWNCAST(view.len, Py_ssize_t, unsigned int)); + PyBuffer_Release(&view); } - - PyBuffer_Release(&view); + return (PyObject *)md5p; } |