benign buffer overflow fix (ITS#1964)

[openldap] / servers / slapd / back-sql / util.c

diff --git a/servers/slapd/back-sql/util.c b/servers/slapd/back-sql/util.c
index ffd10efc9516e7f813661025ee440e895a0aeb3f..1b7e3379ff742b1272ed7ec9ab387e60fbe49fe9 100644 (file)
--- a/servers/slapd/back-sql/util.c
+++ b/servers/slapd/back-sql/util.c
@@ -212,6 +212,8 @@ backsql_strfcat( struct berval *dest, ber_len_t *buflen, const char *fmt, ... )
 #endif /* BACKSQL_TRACE */
                }
 
+               assert( cstr );
+               
                AC_MEMCPY( dest->bv_val + cdlen, cstr, cslen + 1 );
                cdlen += cslen;
        }
@@ -273,7 +275,7 @@ char *
 backsql_get_table_spec( char **p )
 {
        char            *s, *q;
-       struct berval   res = { 0, NULL };
+       struct berval   res = BER_BVNULL;
        ber_len_t       res_len = 0;
 
        assert( p );