Add error checks to prev commit

[openldap] / servers / slapd / attr.c

diff --git a/servers/slapd/attr.c b/servers/slapd/attr.c
index 51f50758fcef64af13444d83e73127ebdaacf357..b97ee9abb0faf5ecec893df027454ce0d62e2c49 100644 (file)
--- a/servers/slapd/attr.c
+++ b/servers/slapd/attr.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2011 The OpenLDAP Foundation.
+ * Copyright 1998-2013 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -232,13 +232,16 @@ attr_dup2( Attribute *tmp, Attribute *a )
                if ( a->a_nvals != a->a_vals ) {
 
                        tmp->a_nvals = ch_malloc( (tmp->a_numvals + 1) * sizeof(struct berval) );
-                       for ( j = 0; !BER_BVISNULL( &a->a_nvals[j] ); j++ ) {
-                               assert( j < i );
-                               ber_dupbv( &tmp->a_nvals[j], &a->a_nvals[j] );
-                               if ( BER_BVISNULL( &tmp->a_nvals[j] ) ) break;
-                               /* FIXME: error? */
+                       j = 0;
+                       if ( i ) {
+                               for ( ; !BER_BVISNULL( &a->a_nvals[j] ); j++ ) {
+                                       assert( j < i );
+                                       ber_dupbv( &tmp->a_nvals[j], &a->a_nvals[j] );
+                                       if ( BER_BVISNULL( &tmp->a_nvals[j] ) ) break;
+                                       /* FIXME: error? */
+                               }
+                               assert( j == i );
                        }
-                       assert( j == i );
                        BER_BVZERO( &tmp->a_nvals[j] );
 
                } else {