nikon/CANopenLinux
1
0
Fork 0
Code Activity Actions

Fixed issue where CO_driver and CO_epoll_interface produce valgrind error because epoll_event is passed into epoll_ctl uninitialized.

Browse source
This commit is contained in:
Rene Colato 2021-08-12 11:34:35 -04:00
parent b4c6ba0e13
commit a2d7e89a45
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CO_driver.c
View file

@ -277,7 +277,7 @@ CO_ReturnError_t CO_CANmodule_addInterface(CO_CANmodule_t *CANmodule,
socklen_t sLen; socklen_t sLen;
CO_CANinterface_t *interface; CO_CANinterface_t *interface;
struct sockaddr_can sockAddr; struct sockaddr_can sockAddr;
struct epoll_event ev; struct epoll_event ev = {0};
#if CO_DRIVER_ERROR_REPORTING > 0 #if CO_DRIVER_ERROR_REPORTING > 0
can_err_mask_t err_mask; can_err_mask_t err_mask;
#endif #endif

8
CO_epoll_interface.c
View file

@ -67,7 +67,7 @@ static inline uint64_t clock_gettime_us(void) {
CO_ReturnError_t CO_epoll_create(CO_epoll_t *ep, uint32_t timerInterval_us) { CO_ReturnError_t CO_epoll_create(CO_epoll_t *ep, uint32_t timerInterval_us) {
int ret; int ret;
struct epoll_event ev; struct epoll_event ev = {0};
if (ep == NULL) { if (ep == NULL) {
return CO_ERROR_ILLEGAL_ARGUMENT; return CO_ERROR_ILLEGAL_ARGUMENT;
@ -381,7 +381,7 @@ static size_t gtwa_write_response(void *object,
} }
static inline void socetAcceptEnableForEpoll(CO_epoll_gtw_t *epGtw) { static inline void socetAcceptEnableForEpoll(CO_epoll_gtw_t *epGtw) {
struct epoll_event ev; struct epoll_event ev = {0};
int ret; int ret;
ev.events = EPOLLIN | EPOLLONESHOT; ev.events = EPOLLIN | EPOLLONESHOT;
@ -399,7 +399,7 @@ CO_ReturnError_t CO_epoll_createGtw(CO_epoll_gtw_t *epGtw,
char *localSocketPath) char *localSocketPath)
{ {
int ret; int ret;
struct epoll_event ev; struct epoll_event ev = {0};
if (epGtw == NULL || epoll_fd < 0) { if (epGtw == NULL || epoll_fd < 0) {
return CO_ERROR_ILLEGAL_ARGUMENT; return CO_ERROR_ILLEGAL_ARGUMENT;
@ -589,7 +589,7 @@ void CO_epoll_processGtw(CO_epoll_gtw_t *epGtw,
} }
else { else {
/* add fd to epoll */ /* add fd to epoll */
struct epoll_event ev2; struct epoll_event ev2 = {0};
ev2.events = EPOLLIN; ev2.events = EPOLLIN;
ev2.data.fd = epGtw->gtwa_fd; ev2.data.fd = epGtw->gtwa_fd;
int ret = epoll_ctl(ep->epoll_fd, int ret = epoll_ctl(ep->epoll_fd,