return 1;
}
- om = (OidMacro *) SLAP_MALLOC( sizeof(OidMacro) );
+ om = (OidMacro *) SLAP_CALLOC( sizeof(OidMacro), 1 );
if( om == NULL ) {
- Debug( LDAP_DEBUG_ANY, "parse_oidm: SLAP_MALLOC failed", 0, 0, 0 );
+ Debug( LDAP_DEBUG_ANY, "parse_oidm: SLAP_CALLOC failed", 0, 0, 0 );
return 1;
}
{
OidMacro *om;
int i, j, num;
- struct berval bv, *bva = NULL, idx;
+ struct berval *bva = NULL, idx;
char ibuf[32], *ptr;
if ( !start )
/* count the result size */
i = 0;
- for ( om=start; om && om!=end; om=LDAP_STAILQ_NEXT(om, som_next)) {
+ for ( om=start; om; om=LDAP_STAILQ_NEXT(om, som_next)) {
if ( sys && !(om->som_flags & SLAP_OM_HARDCODE)) continue;
for ( j=0; !BER_BVISNULL(&om->som_names[j]); j++ );
i += j;
+ if ( om == end ) break;
}
num = i;
if (!i) return;
idx.bv_len = 0;
ibuf[0] = '\0';
}
- for ( i=0,om=start; om && om!=end; om=LDAP_STAILQ_NEXT(om, som_next)) {
+ for ( i=0,om=start; om; om=LDAP_STAILQ_NEXT(om, som_next)) {
if ( sys && !(om->som_flags & SLAP_OM_HARDCODE)) continue;
for ( j=0; !BER_BVISNULL(&om->som_names[j]); i++,j++ ) {
if ( !sys ) {
- idx.bv_len = sprintf(idx.bv_val, "{%02d}", i );
+ idx.bv_len = sprintf(idx.bv_val, "{%d}", i );
}
bva[i].bv_len = idx.bv_len + om->som_names[j].bv_len +
om->som_subs[j].bv_len + 1;
strcpy( ptr, om->som_subs[j].bv_val );
}
if ( i>=num ) break;
+ if ( om == end ) break;
}
*res = bva;
}