Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
hiredis
Commits
f5d25850
Unverified
Commit
f5d25850
authored
May 25, 2020
by
Michael Grunder
Committed by
GitHub
May 25, 2020
Browse files
Use unique names for allocator struct members (#823)
Using `strdup` as a struct member causes issues in older gcc
parent
8e0264cf
Changes
3
Hide whitespace changes
Inline
Side-by-side
alloc.c
View file @
f5d25850
...
...
@@ -34,11 +34,11 @@
#include <stdlib.h>
hiredisAllocFuncs
hiredisAllocFns
=
{
.
malloc
=
malloc
,
.
calloc
=
calloc
,
.
realloc
=
realloc
,
.
strdup
=
strdup
,
.
free
=
free
,
.
malloc
Fn
=
malloc
,
.
calloc
Fn
=
calloc
,
.
realloc
Fn
=
realloc
,
.
strdup
Fn
=
strdup
,
.
free
Fn
=
free
,
};
/* Override hiredis' allocators with ones supplied by the user */
...
...
@@ -53,34 +53,34 @@ hiredisAllocFuncs hiredisSetAllocators(hiredisAllocFuncs *override) {
/* Reset allocators to use libc defaults */
void
hiredisResetAllocators
(
void
)
{
hiredisAllocFns
=
(
hiredisAllocFuncs
)
{
.
malloc
=
malloc
,
.
calloc
=
calloc
,
.
realloc
=
realloc
,
.
strdup
=
strdup
,
.
free
=
free
,
.
malloc
Fn
=
malloc
,
.
calloc
Fn
=
calloc
,
.
realloc
Fn
=
realloc
,
.
strdup
Fn
=
strdup
,
.
free
Fn
=
free
,
};
}
#ifdef _WIN32
void
*
hi_malloc
(
size_t
size
)
{
return
hiredisAllocFns
.
malloc
(
size
);
return
hiredisAllocFns
.
malloc
Fn
(
size
);
}
void
*
hi_calloc
(
size_t
nmemb
,
size_t
size
)
{
return
hiredisAllocFns
.
calloc
(
nmemb
,
size
);
return
hiredisAllocFns
.
calloc
Fn
(
nmemb
,
size
);
}
void
*
hi_realloc
(
void
*
ptr
,
size_t
size
)
{
return
hiredisAllocFns
.
realloc
(
ptr
,
size
);
return
hiredisAllocFns
.
realloc
Fn
(
ptr
,
size
);
}
char
*
hi_strdup
(
const
char
*
str
)
{
return
hiredisAllocFns
.
strdup
(
str
);
return
hiredisAllocFns
.
strdup
Fn
(
str
);
}
void
hi_free
(
void
*
ptr
)
{
hiredisAllocFns
.
free
(
ptr
);
hiredisAllocFns
.
free
Fn
(
ptr
);
}
#endif
alloc.h
View file @
f5d25850
...
...
@@ -39,11 +39,11 @@ extern "C" {
/* Structure pointing to our actually configured allocators */
typedef
struct
hiredisAllocFuncs
{
void
*
(
*
malloc
)(
size_t
);
void
*
(
*
calloc
)(
size_t
,
size_t
);
void
*
(
*
realloc
)(
void
*
,
size_t
);
char
*
(
*
strdup
)(
const
char
*
);
void
(
*
free
)(
void
*
);
void
*
(
*
malloc
Fn
)(
size_t
);
void
*
(
*
calloc
Fn
)(
size_t
,
size_t
);
void
*
(
*
realloc
Fn
)(
void
*
,
size_t
);
char
*
(
*
strdup
Fn
)(
const
char
*
);
void
(
*
free
Fn
)(
void
*
);
}
hiredisAllocFuncs
;
hiredisAllocFuncs
hiredisSetAllocators
(
hiredisAllocFuncs
*
ha
);
...
...
@@ -55,23 +55,23 @@ void hiredisResetAllocators(void);
extern
hiredisAllocFuncs
hiredisAllocFns
;
static
inline
void
*
hi_malloc
(
size_t
size
)
{
return
hiredisAllocFns
.
malloc
(
size
);
return
hiredisAllocFns
.
malloc
Fn
(
size
);
}
static
inline
void
*
hi_calloc
(
size_t
nmemb
,
size_t
size
)
{
return
hiredisAllocFns
.
calloc
(
nmemb
,
size
);
return
hiredisAllocFns
.
calloc
Fn
(
nmemb
,
size
);
}
static
inline
void
*
hi_realloc
(
void
*
ptr
,
size_t
size
)
{
return
hiredisAllocFns
.
realloc
(
ptr
,
size
);
return
hiredisAllocFns
.
realloc
Fn
(
ptr
,
size
);
}
static
inline
char
*
hi_strdup
(
const
char
*
str
)
{
return
hiredisAllocFns
.
strdup
(
str
);
return
hiredisAllocFns
.
strdup
Fn
(
str
);
}
static
inline
void
hi_free
(
void
*
ptr
)
{
hiredisAllocFns
.
free
(
ptr
);
hiredisAllocFns
.
free
Fn
(
ptr
);
}
#else
...
...
test.c
View file @
f5d25850
...
...
@@ -547,10 +547,10 @@ static void *hi_realloc_fail(void *ptr, size_t size) {
static
void
test_allocator_injection
(
void
)
{
hiredisAllocFuncs
ha
=
{
.
malloc
=
hi_malloc_fail
,
.
calloc
=
hi_calloc_fail
,
.
realloc
=
hi_realloc_fail
,
.
free
=
NULL
,
.
malloc
Fn
=
hi_malloc_fail
,
.
calloc
Fn
=
hi_calloc_fail
,
.
realloc
Fn
=
hi_realloc_fail
,
.
free
Fn
=
NULL
,
};
// Override hiredis allocators
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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