Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Joe Martin
OpenLDAP
Commits
8fb8b17c
Commit
8fb8b17c
authored
Apr 06, 2006
by
Kurt Zeilenga
Browse files
Code which doesn't hanlding allocation failure should use
ch_ routines, not SLAP_ macros
parent
1b9d68d6
Changes
3
Hide whitespace changes
Inline
Side-by-side
servers/slapd/back-ldif/ldif.c
View file @
8fb8b17c
...
...
@@ -354,11 +354,11 @@ static int r_enum_tree(enumCookie *ck, struct berval *path,
}
else
{
/* Queueing up for tool mode */
if
(
ck
->
entries
==
NULL
)
{
ck
->
entries
=
(
Entry
**
)
SLAP_MALLOC
(
sizeof
(
Entry
*
)
*
ENTRY_BUFF_INCREMENT
);
ck
->
entries
=
(
Entry
**
)
ch_malloc
(
sizeof
(
Entry
*
)
*
ENTRY_BUFF_INCREMENT
);
ck
->
elen
=
ENTRY_BUFF_INCREMENT
;
}
if
(
ck
->
eind
>=
ck
->
elen
)
{
/* grow entries if necessary */
ck
->
entries
=
(
Entry
**
)
SLAP_REALLOC
(
ck
->
entries
,
sizeof
(
Entry
*
)
*
(
ck
->
elen
)
*
2
);
ck
->
entries
=
(
Entry
**
)
ch_realloc
(
ck
->
entries
,
sizeof
(
Entry
*
)
*
(
ck
->
elen
)
*
2
);
ck
->
elen
*=
2
;
}
...
...
servers/slapd/referral.c
View file @
8fb8b17c
...
...
@@ -108,12 +108,7 @@ static char * referral_dn_muck(
}
muck
.
bv_len
=
ntargetDN
.
bv_len
+
nrefDN
.
bv_len
-
nbaseDN
.
bv_len
;
muck
.
bv_val
=
SLAP_MALLOC
(
muck
.
bv_len
+
1
);
if
(
muck
.
bv_val
==
NULL
)
{
Debug
(
LDAP_DEBUG_ANY
,
"referral_dn_muck: SLAP_MALLOC failed
\n
"
,
0
,
0
,
0
);
return
NULL
;
}
muck
.
bv_val
=
ch_malloc
(
muck
.
bv_len
+
1
);
strncpy
(
muck
.
bv_val
,
ntargetDN
.
bv_val
,
ntargetDN
.
bv_len
-
nbaseDN
.
bv_len
);
...
...
@@ -217,12 +212,7 @@ BerVarray referral_rewrite(
return
NULL
;
}
refs
=
SLAP_MALLOC
(
(
i
+
1
)
*
sizeof
(
struct
berval
)
);
if
(
refs
==
NULL
)
{
Debug
(
LDAP_DEBUG_ANY
,
"referral_rewrite: SLAP_MALLOC failed
\n
"
,
0
,
0
,
0
);
return
NULL
;
}
refs
=
ch_malloc
(
(
i
+
1
)
*
sizeof
(
struct
berval
)
);
for
(
iv
=
in
,
jv
=
refs
;
!
BER_BVISNULL
(
iv
);
iv
++
)
{
LDAPURLDesc
*
url
;
...
...
@@ -292,12 +282,7 @@ BerVarray get_entry_referrals(
if
(
i
<
1
)
return
NULL
;
refs
=
SLAP_MALLOC
(
(
i
+
1
)
*
sizeof
(
struct
berval
));
if
(
refs
==
NULL
)
{
Debug
(
LDAP_DEBUG_ANY
,
"get_entry_referrals: SLAP_MALLOC failed
\n
"
,
0
,
0
,
0
);
return
NULL
;
}
refs
=
ch_malloc
(
(
i
+
1
)
*
sizeof
(
struct
berval
));
for
(
iv
=
attr
->
a_vals
,
jv
=
refs
;
iv
->
bv_val
!=
NULL
;
iv
++
)
{
unsigned
k
;
...
...
servers/slapd/result.c
View file @
8fb8b17c
...
...
@@ -83,11 +83,7 @@ static char *v2ref( BerVarray ref, const char *text )
}
}
v2
=
SLAP_MALLOC
(
len
+
i
+
sizeof
(
"Referral:"
)
);
if
(
v2
==
NULL
)
{
Debug
(
LDAP_DEBUG_ANY
,
"v2ref: SLAP_MALLOC failed"
,
0
,
0
,
0
);
return
NULL
;
}
v2
=
ch_malloc
(
len
+
i
+
sizeof
(
"Referral:"
)
);
if
(
text
!=
NULL
)
{
strcpy
(
v2
,
text
);
...
...
@@ -99,11 +95,7 @@ static char *v2ref( BerVarray ref, const char *text )
len
+=
sizeof
(
"Referral:"
);
for
(
i
=
0
;
ref
[
i
].
bv_val
!=
NULL
;
i
++
)
{
v2
=
SLAP_REALLOC
(
v2
,
len
+
ref
[
i
].
bv_len
+
1
);
if
(
v2
==
NULL
)
{
Debug
(
LDAP_DEBUG_ANY
,
"v2ref: SLAP_MALLOC failed"
,
0
,
0
,
0
);
return
NULL
;
}
v2
=
ch_realloc
(
v2
,
len
+
ref
[
i
].
bv_len
+
1
);
v2
[
len
-
1
]
=
'\n'
;
AC_MEMCPY
(
&
v2
[
len
],
ref
[
i
].
bv_val
,
ref
[
i
].
bv_len
);
len
+=
ref
[
i
].
bv_len
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment