Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Tero Saarni
OpenLDAP
Commits
f6622d70
Commit
f6622d70
authored
Jan 04, 2011
by
Quanah Gibson-Mount
Browse files
ITS#6733
parent
6553ebfd
Changes
2
Hide whitespace changes
Inline
Side-by-side
CHANGES
View file @
f6622d70
...
...
@@ -10,6 +10,7 @@ OpenLDAP 2.4.24 Engineering
Added slapd-sql support for long long keys (ITS#6617)
Fixed liblber to not close invalid sockets (ITS#6585)
Fixed liblber error setting (ITS#6732)
Fixed liblber memory debugging (ITS#6733)
Fixed libldap dnssrv port format specifier (ITS#6644)
Fixed libldap EOF handling (ITS#6723)
Fixed libldap GnuTLS hang on socket close (ITS#6673)
...
...
libraries/liblber/memory.c
View file @
f6622d70
...
...
@@ -62,9 +62,9 @@ struct ber_mem_hdr {
};
/* Pattern at top of allocated space */
#define LBER_MEM_JUNK 0xdeaddada
U
#define LBER_MEM_JUNK
((ber_int_t)
0xdeaddada
)
static
const
struct
ber_mem_hdr
ber_int_mem_hdr
=
{
LBER_MEM_JUNK
,
0
,
0
};
static
const
struct
ber_mem_hdr
ber_int_mem_hdr
=
{
LBER_MEM_JUNK
};
/* Note sequence and ber_int_meminuse are counters, but are not
* thread safe. If you want to use these values for multithreaded applications,
...
...
@@ -256,7 +256,9 @@ ber_memcalloc_x( ber_len_t n, ber_len_t s, void *ctx )
if
(
ber_int_memory_fns
==
NULL
||
ctx
==
NULL
)
{
#ifdef LDAP_MEMORY_DEBUG
new
=
calloc
(
1
,
n
*
s
+
sizeof
(
struct
ber_mem_hdr
)
+
sizeof
(
ber_int_t
));
new
=
n
<
(
-
sizeof
(
struct
ber_mem_hdr
)
-
sizeof
(
ber_int_t
))
/
s
?
calloc
(
1
,
n
*
s
+
sizeof
(
struct
ber_mem_hdr
)
+
sizeof
(
ber_int_t
))
:
NULL
;
if
(
new
)
{
struct
ber_mem_hdr
*
mh
=
new
;
...
...
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