Merge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4

[openldap] / libraries / librewrite / var.c

diff --git a/libraries/librewrite/var.c b/libraries/librewrite/var.c
index 24602e7a47d98351a37a6cc696f885107d4479c2..a155d3f7c1af18ca091cf59ea8ac142ba9f4d45d 100644 (file)
--- a/libraries/librewrite/var.c
+++ b/libraries/librewrite/var.c
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2000-2007 The OpenLDAP Foundation.
+ * Copyright 2000-2013 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -123,7 +123,11 @@ rewrite_var_replace(
                int flags
 )
 {
-       ber_len_t       len = strlen( value );
+       ber_len_t       len;
+
+       assert( value != NULL );
+
+       len = strlen( value );
 
        if ( var->lv_flags & REWRITE_VAR_COPY_VALUE ) {
                if ( flags & REWRITE_VAR_COPY_VALUE ) {
@@ -151,6 +155,10 @@ rewrite_var_replace(
                }
        }
 
+       if ( var->lv_value.bv_val == NULL ) {
+               return -1;
+       }
+
        var->lv_value.bv_len = len;
 
        return 0;