[Python-checkins] r70136 - in python/trunk/Modules: sha256module.c sha512module.c

hirokazu.yamamoto python-checkins at python.org
Tue Mar 3 23:05:58 CET 2009


Author: hirokazu.yamamoto
Date: Tue Mar  3 23:05:57 2009
New Revision: 70136

Log:
Fixed memory leak.

Modified:
   python/trunk/Modules/sha256module.c
   python/trunk/Modules/sha512module.c

Modified: python/trunk/Modules/sha256module.c
==============================================================================
--- python/trunk/Modules/sha256module.c	(original)
+++ python/trunk/Modules/sha256module.c	Tue Mar  3 23:05:57 2009
@@ -629,13 +629,18 @@
     if (data_obj)
         GET_BUFFER_VIEW_OR_ERROUT(data_obj, &buf, NULL);
 
-    if ((new = newSHA256object()) == NULL)
+    if ((new = newSHA256object()) == NULL) {
+        if (data_obj)
+            PyBuffer_Release(&buf);
         return NULL;
+    }
 
     sha_init(new);
 
     if (PyErr_Occurred()) {
         Py_DECREF(new);
+        if (data_obj)
+            PyBuffer_Release(&buf);
         return NULL;
     }
     if (data_obj) {
@@ -665,13 +670,18 @@
     if (data_obj)
         GET_BUFFER_VIEW_OR_ERROUT(data_obj, &buf, NULL);
 
-    if ((new = newSHA224object()) == NULL)
+    if ((new = newSHA224object()) == NULL) {
+        if (data_obj)
+            PyBuffer_Release(&buf);
         return NULL;
+    }
 
     sha224_init(new);
 
     if (PyErr_Occurred()) {
         Py_DECREF(new);
+        if (data_obj)
+            PyBuffer_Release(&buf);
         return NULL;
     }
     if (data_obj) {

Modified: python/trunk/Modules/sha512module.c
==============================================================================
--- python/trunk/Modules/sha512module.c	(original)
+++ python/trunk/Modules/sha512module.c	Tue Mar  3 23:05:57 2009
@@ -695,13 +695,18 @@
     if (data_obj)
         GET_BUFFER_VIEW_OR_ERROUT(data_obj, &buf, NULL);
 
-    if ((new = newSHA512object()) == NULL)
+    if ((new = newSHA512object()) == NULL) {
+        if (data_obj)
+            PyBuffer_Release(&buf);
         return NULL;
+    }
 
     sha512_init(new);
 
     if (PyErr_Occurred()) {
         Py_DECREF(new);
+        if (data_obj)
+            PyBuffer_Release(&buf);
         return NULL;
     }
     if (data_obj) {
@@ -731,13 +736,18 @@
     if (data_obj)
         GET_BUFFER_VIEW_OR_ERROUT(data_obj, &buf, NULL);
 
-    if ((new = newSHA384object()) == NULL)
+    if ((new = newSHA384object()) == NULL) {
+        if (data_obj)
+            PyBuffer_Release(&buf);
         return NULL;
+    }
 
     sha384_init(new);
 
     if (PyErr_Occurred()) {
         Py_DECREF(new);
+        if (data_obj)
+            PyBuffer_Release(&buf);
         return NULL;
     }
     if (data_obj) {


More information about the Python-checkins mailing list