X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Foidm.c;h=4075171d13f18169c89b35fe0c5aedb5d483c0e1;hb=75757a5c82fc6a9333807517705c99e090428142;hp=d779496a412177901ae6b5f9ab5edfbfa49de0c0;hpb=6ed15e335069a6dd7cd30971066d6be69a4b1e42;p=openldap

diff --git a/servers/slapd/oidm.c b/servers/slapd/oidm.c
index d779496a41..4075171d13 100644
--- a/servers/slapd/oidm.c
+++ b/servers/slapd/oidm.c
@@ -43,8 +43,18 @@ oidm_find(char *oid)
 
 			if( pos ) {
 				int suflen = strlen(oid + pos);
-				char *tmp = ch_malloc( om->som_oid.bv_len
+				char *tmp = SLAP_MALLOC( om->som_oid.bv_len
 					+ suflen + 1);
+				if( tmp == NULL ) {
+#ifdef NEW_LOGGING
+					LDAP_LOG( OPERATION, ERR,
+						"oidm_find: SLAP_MALLOC failed", 0, 0, 0 );
+#else
+					Debug( LDAP_DEBUG_ANY,
+						"oidm_find: SLAP_MALLOC failed", 0, 0, 0 );
+#endif
+					return NULL;
+				}
 				strcpy(tmp, om->som_oid.bv_val);
 				if( suflen ) {
 					suflen = om->som_oid.bv_len;
@@ -65,7 +75,7 @@ oidm_destroy()
 
 	for (om = om_list; om; om = n) {
 		n = om->som_next;
-		charray_free(om->som_names);
+		ldap_charray_free(om->som_names);
 		free(om->som_oid.bv_val);
 		free(om);
 	}
@@ -98,10 +108,18 @@ usage:	fprintf( stderr, "\tObjectIdentifier <name> <oid>\n");
 		return 1;
 	}
 
-	om = (OidMacro *) ch_malloc( sizeof(OidMacro) );
+	om = (OidMacro *) SLAP_MALLOC( sizeof(OidMacro) );
+	if( om == NULL ) {
+#ifdef NEW_LOGGING
+		LDAP_LOG( OPERATION, ERR, "parse_oidm: SLAP_MALLOC failed", 0, 0, 0 );
+#else
+		Debug( LDAP_DEBUG_ANY, "parse_oidm: SLAP_MALLOC failed", 0, 0, 0 );
+#endif
+		return 1;
+	}
 
 	om->som_names = NULL;
-	charray_add( &om->som_names, argv[1] );
+	ldap_charray_add( &om->som_names, argv[1] );
 	om->som_oid.bv_val = oidm_find( argv[2] );
 
 	if (!om->som_oid.bv_val) {