Fix SHA_new and MD5_new, that would crash if not given initial data

diff --git a/Modules/md5module.c b/Modules/md5module.c
index 0b150a0bd2560001a421ca2ae5c362c8e5248095..7081706ba3ce42e31c156bb3f5b5eee14455e0c1 100644 (file)
--- 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;
 }
 

diff --git a/Modules/shamodule.c b/Modules/shamodule.c
index e89a1eab0e365f2d2769764b6698faf874ba292a..6399b752a58cf908a26e2de873462295c4e382f4 100644 (file)
--- 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;
 }