minor cleanup

[openldap] / servers / slapd / back-bdb / config.c

diff --git a/servers/slapd/back-bdb/config.c b/servers/slapd/back-bdb/config.c
index 9ac83de4474b95b00860326369be29e99b929685..5c5ff8428ef16811e47d5ef4ced51b051d641191 100644 (file)
--- a/servers/slapd/back-bdb/config.c
+++ b/servers/slapd/back-bdb/config.c
@@ -67,7 +67,7 @@ static ConfigTable bdbcfg[] = {
        { "dbconfig", "DB_CONFIG setting", 1, 0, 0, ARG_MAGIC|BDB_CONFIG,
                bdb_cf_gen, "( OLcfgDbAt:1.3 NAME 'olcDbConfig' "
                        "DESC 'BerkeleyDB DB_CONFIG configuration directives' "
-                       "SYNTAX OMsDirectoryString X-ORDERED 'VALUES' )",NULL, NULL },
+                       "SYNTAX OMsDirectoryString X-ORDERED 'VALUES' )", NULL, NULL },
        { "dbnosync", NULL, 1, 2, 0, ARG_ON_OFF|ARG_MAGIC|BDB_NOSYNC,
                bdb_cf_gen, "( OLcfgDbAt:1.4 NAME 'olcDbNoSync' "
                        "DESC 'Disable synchronous database writes' "
@@ -356,12 +356,12 @@ bdb_cf_gen(ConfigArgs *c)
                                        bdb->bi_flags |= BDB_HAS_CONFIG;
                                        while ( fgets( buf, sizeof(buf), f )) {
                                                ber_str2bv( buf, 0, 1, &bv );
-                                               if ( bv.bv_val[bv.bv_len-1] == '\n' ) {
+                                               if ( bv.bv_len > 0 && bv.bv_val[bv.bv_len-1] == '\n' ) {
                                                        bv.bv_len--;
                                                        bv.bv_val[bv.bv_len] = '\0';
                                                }
                                                /* shouldn't need this, but ... */
-                                               if ( bv.bv_val[bv.bv_len-1] == '\r' ) {
+                                               if ( bv.bv_len > 0 && bv.bv_val[bv.bv_len-1] == '\r' ) {
                                                        bv.bv_len--;
                                                        bv.bv_val[bv.bv_len] = '\0';
                                                }