From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Wed, 27 Feb 2002 22:29:36 +0000 (+0000)
Subject: removed cycle from gnutls_free and gnutls_secure_free.
X-Git-Tag: gnutls_0_3_91~16
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=99efcf6804cecb5cf0ef5edfb73f868be67d5db9;p=thirdparty%2Fgnutls.git

removed cycle from gnutls_free and gnutls_secure_free.
---

diff --git a/lib/gnutls_mem.c b/lib/gnutls_mem.c
index 25476482e4..d2b8b63df4 100644
--- a/lib/gnutls_mem.c
+++ b/lib/gnutls_mem.c
@@ -121,6 +121,21 @@ void *gnutls_realloc_fast(void *ptr, size_t size)
 	return gnutls_realloc(ptr, size);
 }
 
+inline
+static void _gnutls_free(void *_ptr)
+{
+opaque *ptr = _ptr;
+
+
+	ptr -= EXTRA_SIZE;
+
+#ifdef MALLOC_DEBUG
+	_gnutls_log("Freed: %x with %d bytes\n", _ptr,
+	    _gnutls_malloc_ptr_size(_ptr));
+#endif
+	free(ptr);
+}
+
 void gnutls_free(void *_ptr)
 {
 	if (_ptr == NULL)
@@ -129,19 +144,12 @@ void gnutls_free(void *_ptr)
 	if ( _gnutls_is_secure_memory( _ptr) != 0) {
 		return gnutls_secure_free( _ptr);
 	} else {
-		opaque *ptr = _ptr;
-
-
-		ptr -= EXTRA_SIZE;
-
-#ifdef MALLOC_DEBUG
-		_gnutls_log("Freed: %x with %d bytes\n", _ptr,
-		    _gnutls_malloc_ptr_size(_ptr));
-#endif
-		free(ptr);
+		_gnutls_free( _ptr);
 	}
 }
 
+
+
 svoid *gnutls_secure_malloc(size_t size)
 {
 	opaque *ret;
@@ -200,7 +208,7 @@ opaque* _ptr = ptr;
 	memset(ptr, 0, _gnutls_secure_ptr_size(ptr));
 	*((opaque *) _ptr - 1) = 0;	/* not secure mem */
 
-	gnutls_free(ptr);
+	_gnutls_free(ptr);
 }
 
 char *gnutls_strdup(const char *s)