cuberite/libevent
1
0
Fork 0
mirror of https://github.com/cuberite/libevent.git synced 2025-09-13 06:16:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix a major parenthesis bug in EVUTIL_UPCAST.

Browse Source 
Fortunately, this didn't hurt anything previously, since we had no actual users of the macro where the offset of the base type wasn't 0.

svn:r1488
This commit is contained in:
Nick Mathewson 2009-11-02 19:30:25 +00:00
parent 5f1d6e640f
commit 8283b2f0dc
2 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
test/regress_util.c
View File

@ -465,6 +465,30 @@ end:
; ;
} }
struct example_struct {
long a;
const char *b;
long c;
};
static void
test_evutil_upcast(void *arg)
{
struct example_struct es1;
const char **cp;
es1.a = 5;
es1.b = "Hello";
es1.c = -99;
tt_int_op(evutil_offsetof(struct example_struct, b), ==, sizeof(long));
cp = &es1.b;
tt_ptr_op(EVUTIL_UPCAST(cp, struct example_struct, b), ==, &es1);
end:
;
}
struct testcase_t util_testcases[] = { struct testcase_t util_testcases[] = {
{ "ipv4_parse", regress_ipv4_parse, 0, NULL, NULL }, { "ipv4_parse", regress_ipv4_parse, 0, NULL, NULL },
@ -475,6 +499,7 @@ struct testcase_t util_testcases[] = {
{ "evutil_casecmp", test_evutil_casecmp, 0, NULL, NULL }, { "evutil_casecmp", test_evutil_casecmp, 0, NULL, NULL },
{ "strlcpy", test_evutil_strlcpy, 0, NULL, NULL }, { "strlcpy", test_evutil_strlcpy, 0, NULL, NULL },
{ "log", test_evutil_log, TT_FORK, NULL, NULL }, { "log", test_evutil_log, TT_FORK, NULL, NULL },
{ "upcast", test_evutil_upcast, 0, NULL, NULL },
END_OF_TESTCASES, END_OF_TESTCASES,
}; };

2
util-internal.h
View File

@ -130,7 +130,7 @@ extern const char EVUTIL_TOLOWER_TABLE[];
} }
*/ */
#define EVUTIL_UPCAST(ptr, type, field) \ #define EVUTIL_UPCAST(ptr, type, field) \
((type *)((char*)ptr) - evutil_offsetof(type, field)) ((type *)(((char*)(ptr)) - evutil_offsetof(type, field)))
int evutil_socket_connect(evutil_socket_t *fd_ptr, struct sockaddr *sa, int socklen); int evutil_socket_connect(evutil_socket_t *fd_ptr, struct sockaddr *sa, int socklen);