Merge remote branch 'origin/mdb.master'

[openldap] / libraries / librewrite / params.c

diff --git a/libraries/librewrite/params.c b/libraries/librewrite/params.c
index 07daa0aabd8950d912ea16e0ab9c8b103d2ddbd8..ee4ae5d8018853000be8fe9215a5c24e3dabeae2 100644 (file)
--- a/libraries/librewrite/params.c
+++ b/libraries/librewrite/params.c
@@ -1,26 +1,21 @@
-/******************************************************************************
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright (C) 2000 Pierangelo Masarati, <ando@sys-net.it>
+ * Copyright 2000-2011 The OpenLDAP Foundation.
  * All rights reserved.
  *
- * Permission is granted to anyone to use this software for any purpose
- * on any computer system, and to alter it and redistribute it, subject
- * to the following restrictions:
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
  *
- * 1. The author is not responsible for the consequences of use of this
- * software, no matter how awful, even if they arise from flaws in it.
- *
- * 2. The origin of this software must not be misrepresented, either by
- * explicit claim or by omission.  Since few users ever read sources,
- * credits should appear in the documentation.
- *
- * 3. Altered versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.  Since few users
- * ever read sources, credits should appear in the documentation.
- * 
- * 4. This notice may not be removed or altered.
- *
- ******************************************************************************/
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
+ */
+/* ACKNOWLEDGEMENT:
+ * This work was initially developed by Pierangelo Masarati for
+ * inclusion in OpenLDAP Software.
+ */
 
 #include <portable.h>
 
@@ -37,6 +32,7 @@ rewrite_param_set(
 )
 {
        struct rewrite_var *var;
+       int rc = REWRITE_SUCCESS;
 
        assert( info != NULL );
        assert( name != NULL );
@@ -52,21 +48,20 @@ rewrite_param_set(
                free( var->lv_value.bv_val );
                var->lv_value.bv_val = strdup( value );
                var->lv_value.bv_len = strlen( value );
+
        } else {
                var = rewrite_var_insert( &info->li_params, name, value );
-               if ( var == NULL ) {
-#ifdef USE_REWRITE_LDAP_PVT_THREADS
-                       ldap_pvt_thread_rdwr_wunlock( &info->li_params_mutex );
-#endif /* USE_REWRITE_LDAP_PVT_THREADS */
-                       return REWRITE_ERR;
-               }
-       }       
+       }
+
+       if ( var == NULL || var->lv_value.bv_val == NULL ) {
+               rc = REWRITE_ERR;
+       }
        
 #ifdef USE_REWRITE_LDAP_PVT_THREADS
        ldap_pvt_thread_rdwr_wunlock( &info->li_params_mutex );
 #endif /* USE_REWRITE_LDAP_PVT_THREADS */
 
-       return REWRITE_SUCCESS;
+       return rc;
 }
 
 /*
@@ -80,6 +75,7 @@ rewrite_param_get(
 )
 {
        struct rewrite_var *var;
+       int rc = REWRITE_SUCCESS;
 
        assert( info != NULL );
        assert( name != NULL );
@@ -93,25 +89,38 @@ rewrite_param_get(
 #endif /* USE_REWRITE_LDAP_PVT_THREADS */
        
        var = rewrite_var_find( info->li_params, name );
-       if ( var == NULL ) {
-               
-#ifdef USE_REWRITE_LDAP_PVT_THREADS
-               ldap_pvt_thread_rdwr_runlock( &info->li_params_mutex );
-#endif /* USE_REWRITE_LDAP_PVT_THREADS */
-               
-               return REWRITE_ERR;
-       } else {
+       if ( var != NULL ) {
                value->bv_val = strdup( var->lv_value.bv_val );
                value->bv_len = var->lv_value.bv_len;
        }
+
+       if ( var == NULL || value->bv_val == NULL ) {
+               rc = REWRITE_ERR;
+       }
        
 #ifdef USE_REWRITE_LDAP_PVT_THREADS
-        ldap_pvt_thread_rdwr_runlock( &info->li_params_mutex );
+       ldap_pvt_thread_rdwr_runlock( &info->li_params_mutex );
 #endif /* USE_REWRITE_LDAP_PVT_THREADS */
-       
+
        return REWRITE_SUCCESS;
 }
 
+static void
+rewrite_param_free(
+               void *tmp
+)
+{
+       struct rewrite_var *var = ( struct rewrite_var * )tmp;
+       assert( var != NULL );
+
+       assert( var->lv_name != NULL );
+       assert( var->lv_value.bv_val != NULL );
+
+       free( var->lv_name );
+       free( var->lv_value.bv_val );
+       free( var );
+}
+
 /*
  * Destroys the parameter tree
  */
@@ -128,7 +137,7 @@ rewrite_param_destroy(
        ldap_pvt_thread_rdwr_wlock( &info->li_params_mutex );
 #endif /* USE_REWRITE_LDAP_PVT_THREADS */
        
-       count = avl_free( info->li_params, NULL );
+       count = avl_free( info->li_params, rewrite_param_free );
        info->li_params = NULL;
 
 #ifdef USE_REWRITE_LDAP_PVT_THREADS