Plug mutex/rwlock leaks (destroy them)

[openldap] / servers / slapd / alock.c

diff --git a/servers/slapd/alock.c b/servers/slapd/alock.c
index a5377a560d04e652a2aa15f41ef9091612f26cc0..5fa0704105661bdf46b00516b5aa8d2cacb16f44 100644 (file)
--- a/servers/slapd/alock.c
+++ b/servers/slapd/alock.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2005-2008 The OpenLDAP Foundation.
+ * Copyright 2005-2010 The OpenLDAP Foundation.
  * Portions Copyright 2004-2005 Symas Corporation.
  * All rights reserved.
  *
@@ -23,7 +23,9 @@
 
 #if SLAPD_BDB || SLAPD_HDB
 
+#include <lber.h>
 #include "alock.h"
+#include "lutil.h"
 
 #include <ac/stdlib.h>
 #include <ac/string.h>
@@ -177,7 +179,7 @@ alock_read_iattr ( unsigned char * bufptr )
        assert (bufptr != NULL);
 
        bufptr += sizeof (unsigned long int);
-       for (count=0; count <= sizeof (unsigned long int); ++count) {
+       for (count=0; count <= (int) sizeof (unsigned long int); ++count) {
                val <<= 8;
                val += (unsigned long int) *bufptr--;
        }
@@ -237,8 +239,11 @@ alock_read_slot ( alock_info_t * info,
        slot_data->al_stamp = alock_read_iattr (slotbuf+16);
        slot_data->al_pid   = alock_read_iattr (slotbuf+24);
 
-       if (slot_data->al_appname) free (slot_data->al_appname);
-       slot_data->al_appname = calloc (1, ALOCK_MAX_APPNAME);
+       if (slot_data->al_appname) ber_memfree (slot_data->al_appname);
+       slot_data->al_appname = ber_memcalloc (1, ALOCK_MAX_APPNAME);
+       if (slot_data->al_appname == NULL) {
+               return -1;
+       }
        strncpy (slot_data->al_appname, (char *)slotbuf+32, ALOCK_MAX_APPNAME-1);
        (slot_data->al_appname) [ALOCK_MAX_APPNAME-1] = '\0';
 
@@ -302,7 +307,7 @@ alock_query_slot ( alock_info_t * info )
        (void) memset ((void *) &slot_data, 0, sizeof (alock_slot_t));
        alock_read_slot (info, &slot_data);
 
-       if (slot_data.al_appname != NULL) free (slot_data.al_appname);
+       if (slot_data.al_appname != NULL) ber_memfree (slot_data.al_appname);
        slot_data.al_appname = NULL;
 
        nosave = slot_data.al_lock & ALOCK_NOSAVE;
@@ -335,6 +340,7 @@ alock_open ( alock_info_t * info,
        char * filename;
        int res, max_slot;
        int dirty_count, live_count, nosave;
+       char *ptr;
 
        assert (info != NULL);
        assert (appname != NULL);
@@ -344,17 +350,24 @@ alock_open ( alock_info_t * info,
        slot_data.al_lock = locktype;
        slot_data.al_stamp = time(NULL);
        slot_data.al_pid = getpid();
-       slot_data.al_appname = calloc (1, ALOCK_MAX_APPNAME);
+       slot_data.al_appname = ber_memcalloc (1, ALOCK_MAX_APPNAME);
+       if (slot_data.al_appname == NULL) {
+               return ALOCK_UNSTABLE;
+       }
        strncpy (slot_data.al_appname, appname, ALOCK_MAX_APPNAME-1);
        slot_data.al_appname [ALOCK_MAX_APPNAME-1] = '\0';
 
-       filename = calloc (1, strlen (envdir) + strlen ("/alock") + 1);
-       strcpy (filename, envdir);
-       strcat (filename, "/alock");
+       filename = ber_memcalloc (1, strlen (envdir) + strlen ("/alock") + 1);
+       if (filename == NULL ) {
+               ber_memfree (slot_data.al_appname);
+               return ALOCK_UNSTABLE;
+       }
+       ptr = lutil_strcopy(filename, envdir);
+       lutil_strcopy(ptr, "/alock");
        info->al_fd = open (filename, O_CREAT|O_RDWR, 0666);
-       free (filename);
+       ber_memfree (filename);
        if (info->al_fd < 0) {
-               free (slot_data.al_appname);
+               ber_memfree (slot_data.al_appname);
                return ALOCK_UNSTABLE;
        }
        info->al_slot = 0;
@@ -362,14 +375,14 @@ alock_open ( alock_info_t * info,
        res = alock_grab_lock (info->al_fd, 0);
        if (res == -1) { 
                close (info->al_fd);
-               free (slot_data.al_appname);
+               ber_memfree (slot_data.al_appname);
                return ALOCK_UNSTABLE;
        }
 
        res = fstat (info->al_fd, &statbuf);
        if (res == -1) { 
                close (info->al_fd);
-               free (slot_data.al_appname);
+               ber_memfree (slot_data.al_appname);
                return ALOCK_UNSTABLE;
        }
 
@@ -396,9 +409,10 @@ alock_open ( alock_info_t * info,
                                ++live_count;
 
                        } else if (res == ALOCK_UNIQUE
-                               && locktype == ALOCK_UNIQUE) {
+                               && (( locktype & ALOCK_SMASK ) == ALOCK_UNIQUE
+                               || nosave )) {
                                close (info->al_fd);
-                               free (slot_data.al_appname);
+                               ber_memfree (slot_data.al_appname);
                                return ALOCK_BUSY;
 
                        } else if (res == ALOCK_DIRTY) {
@@ -406,7 +420,7 @@ alock_open ( alock_info_t * info,
 
                        } else if (res == -1) {
                                close (info->al_fd);
-                               free (slot_data.al_appname);
+                               ber_memfree (slot_data.al_appname);
                                return ALOCK_UNSTABLE;
 
                        }
@@ -415,7 +429,7 @@ alock_open ( alock_info_t * info,
 
        if (dirty_count && live_count) {
                close (info->al_fd);
-               free (slot_data.al_appname);
+               ber_memfree (slot_data.al_appname);
                return ALOCK_UNSTABLE;
        }
        
@@ -424,11 +438,11 @@ alock_open ( alock_info_t * info,
                               info->al_slot);
        if (res == -1) { 
                close (info->al_fd);
-               free (slot_data.al_appname);
+               ber_memfree (slot_data.al_appname);
                return ALOCK_UNSTABLE;
        }
        res = alock_write_slot (info, &slot_data);
-       free (slot_data.al_appname);
+       ber_memfree (slot_data.al_appname);
        if (res == -1) { 
                close (info->al_fd);
                return ALOCK_UNSTABLE;
@@ -537,7 +551,7 @@ alock_close ( alock_info_t * info, int nosave )
        if (res == -1) {
                close (info->al_fd);
                if (slot_data.al_appname != NULL) 
-                       free (slot_data.al_appname);
+                       ber_memfree (slot_data.al_appname);
                return ALOCK_UNSTABLE;
        }
        slot_data.al_lock = ALOCK_UNLOCKED;
@@ -547,11 +561,11 @@ alock_close ( alock_info_t * info, int nosave )
        if (res == -1) {
                close (info->al_fd);
                if (slot_data.al_appname != NULL) 
-                       free (slot_data.al_appname);
+                       ber_memfree (slot_data.al_appname);
                return ALOCK_UNSTABLE;
        }
        if (slot_data.al_appname != NULL) {
-               free (slot_data.al_appname);
+               ber_memfree (slot_data.al_appname);
                slot_data.al_appname = NULL;
        }
 
@@ -623,11 +637,11 @@ alock_recover ( alock_info_t * info )
                                if (res == -1) {
                                        close (info->al_fd);
                                        if (slot_data.al_appname != NULL) 
-                                               free (slot_data.al_appname);
+                                               ber_memfree (slot_data.al_appname);
                                        return ALOCK_UNSTABLE;
                                }
                                if (slot_data.al_appname != NULL) {
-                                       free (slot_data.al_appname);
+                                       ber_memfree (slot_data.al_appname);
                                        slot_data.al_appname = NULL;
                                }