cuberite/libevent
1
0
Fork 0
mirror of https://github.com/cuberite/libevent.git synced 2025-09-09 20:41:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix garbage value in socketpair util function, stdint?

Browse Source 
* Fixed an issue with evutil_ersatz_socketpair_, listen_addr could all
  be compared against with agarbage values. So just memset it before
  using it anywhere.

* Nick might punch me in the face, but if we have stdint.h; (as in
  EVENT__HAVE_STDINT_H is defined), might as well use those instead of
  the manual [U]INT[X}_MAX/MIN muck in there now.
This commit is contained in:
Mark Ellzey 2015-05-11 12:06:01 -04:00
parent f1b3a1e007
commit 043ae7481f
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
evutil.c
View File

@ -257,6 +257,9 @@ evutil_ersatz_socketpair_(int family, int type, int protocol,
connector = socket(AF_INET, type, 0); connector = socket(AF_INET, type, 0);
if (connector < 0) if (connector < 0)
goto tidy_up_and_fail; goto tidy_up_and_fail;
memset(&connect_addr, 0, sizeof(connect_addr));
/* We want to find out the port number to connect to. */ /* We want to find out the port number to connect to. */
size = sizeof(connect_addr); size = sizeof(connect_addr);
if (getsockname(listener, (struct sockaddr *) &connect_addr, &size) == -1) if (getsockname(listener, (struct sockaddr *) &connect_addr, &size) == -1)

15
include/event2/util.h
View File

@ -233,6 +233,7 @@ extern "C" {
@{ @{
*/ */
#ifndef EVENT__HAVE_STDINT_H
#define EV_UINT64_MAX ((((ev_uint64_t)0xffffffffUL) << 32) | 0xffffffffUL) #define EV_UINT64_MAX ((((ev_uint64_t)0xffffffffUL) << 32) | 0xffffffffUL)
#define EV_INT64_MAX ((((ev_int64_t) 0x7fffffffL) << 32) | 0xffffffffL) #define EV_INT64_MAX ((((ev_int64_t) 0x7fffffffL) << 32) | 0xffffffffL)
#define EV_INT64_MIN ((-EV_INT64_MAX) - 1) #define EV_INT64_MIN ((-EV_INT64_MAX) - 1)
@ -245,7 +246,21 @@ extern "C" {
#define EV_UINT8_MAX 255 #define EV_UINT8_MAX 255
#define EV_INT8_MAX 127 #define EV_INT8_MAX 127
#define EV_INT8_MIN ((-EV_INT8_MAX) - 1) #define EV_INT8_MIN ((-EV_INT8_MAX) - 1)
#else
#define EV_UINT64_MAX UINT64_MAX
#define EV_INT64_MAX INT64_MAX
#define EV_INT64_MIN INT64_MIN
#define EV_UINT32_MAX UINT32_MAX
#define EV_INT32_MAX INT32_MAX
#define EV_INT32_MIN INT32_MIN
#define EV_UINT16_MAX UINT16_MAX
#define EV_INT16_MAX INT16_MAX
#define EV_UINT8_MAX UINT8_MAX
#define EV_INT8_MAX INT8_MAX
#define EV_INT8_MIN INT8_MIN
/** @} */ /** @} */
#endif
/** /**
@name Limits for SIZE_T and SSIZE_T @name Limits for SIZE_T and SSIZE_T