Skip to content

Fix a few memory leaks at shutdown. #156

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wdoekes merged 1 commit into from
Jul 12, 2015
Merged

Fix a few memory leaks at shutdown. #156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion include/screen.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ extern "C" {
#define EXIT_FATAL_ERROR -1
#define EXIT_BIND_ERROR -2

void screen_set_exename(char * exe_name);
void screen_set_exename(const char* exe_name);
void screen_init();
void screen_clear();
int screen_readkey();
Expand Down
2 changes: 0 additions & 2 deletions include/socket.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,6 @@ struct sipp_socket *sipp_allocate_socket(bool use_ipv6, int transport, int fd, i
void setup_ctrl_socket();
void setup_stdin_socket();

char * get_inet_address(struct sockaddr_storage * addr);

int handle_ctrl_socket();
void handle_stdin_socket();
void process_message(struct sipp_socket *socket, char *msg, ssize_t msg_size, struct sockaddr_storage *src);
Expand Down
28 changes: 28 additions & 0 deletions regress/github-#0156/run
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
#!/bin/sh
# This regression test is a part of SIPp.
# Author: Walter Doekes, OSSO B.V., 2015
. "`dirname "$0"`/../functions"; init

# Valgrind on UAS.
valgrind --xml=yes --xml-file=uas.log --partial-loads-ok=yes \
--show-leak-kinds=all --leak-check=full `get_sipp` -nostdin -m 10 -sn uas \
>/dev/null 2>&1 &
uaspid=$!
sleep 1

# Valgrind on UAC.
valgrind --xml=yes --xml-file=uac.log --partial-loads-ok=yes \
--show-leak-kinds=all --leak-check=full `get_sipp` -nostdin -m 10 -sn uac \
127.0.0.1 >/dev/null 2>&1 &
uacpid=$!

wait $uaspid
test $? -ne 0 && fail "UAS returned non-zero"

wait $uacpid
test $? -ne 0 && fail "UAC returned non-zero"

grep -q '<error>' uas.log && fail "valgrind reported leaks in UAS"
grep -q '<error>' uac.log && fail "valgrind reported leaks in UAC"

ok
23 changes: 13 additions & 10 deletions src/call.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -915,16 +915,15 @@ bool call::connect_socket_if_needed()
NULL,
&hints,
&h);
memcpy(&saddr,
h->ai_addr,
SOCK_ADDR_SIZE(
_RCAST(struct sockaddr_storage *,h->ai_addr)));
memcpy(&saddr, h->ai_addr,
SOCK_ADDR_SIZE(_RCAST(struct sockaddr_storage*, h->ai_addr)));

if (use_ipv6) {
(_RCAST(struct sockaddr_in6 *, &saddr))->sin6_port = htons(local_port);
(_RCAST(struct sockaddr_in6*, &saddr))->sin6_port = htons(local_port);
} else {
(_RCAST(struct sockaddr_in *, &saddr))->sin_port = htons(local_port);
(_RCAST(struct sockaddr_in*, &saddr))->sin_port = htons(local_port);
}
freeaddrinfo(h);
}

if (sipp_bind_socket(call_socket, &saddr, &call_port)) {
Expand Down Expand Up @@ -3661,13 +3660,17 @@ call::T_ActionResult call::executeAction(char * msg, message *curmsg)
if (_RCAST(struct sockaddr_storage *, local_addr->ai_addr)->ss_family != call_peer.ss_family) {
ERROR("Can not switch between IPv4 and IPV6 using setdest!");
}
memcpy(&call_peer, local_addr->ai_addr, SOCK_ADDR_SIZE(_RCAST(struct sockaddr_storage *,local_addr->ai_addr)));
memcpy(&call_peer, local_addr->ai_addr,
SOCK_ADDR_SIZE(_RCAST(struct sockaddr_storage*, local_addr->ai_addr)));
freeaddrinfo(local_addr);

if (call_peer.ss_family == AF_INET) {
(_RCAST(struct sockaddr_in *,&call_peer))->sin_port = htons(port);
(_RCAST(struct sockaddr_in*, &call_peer))->sin_port = htons(port);
} else {
(_RCAST(struct sockaddr_in6 *,&call_peer))->sin6_port = htons(port);
(_RCAST(struct sockaddr_in6*, &call_peer))->sin6_port = htons(port);
}
memcpy(&call_socket->ss_dest, &call_peer, SOCK_ADDR_SIZE(_RCAST(struct sockaddr_storage *,&call_peer)));
memcpy(&call_socket->ss_dest, &call_peer,
SOCK_ADDR_SIZE(_RCAST(struct sockaddr_storage*, &call_peer)));

free(str_host);
free(str_port);
Expand Down
11 changes: 7 additions & 4 deletions src/screen.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
#include <sys/resource.h>

#ifdef __SUNOS
#include<stdarg.h>
#include <stdarg.h>
#endif

#include <unistd.h>
Expand Down Expand Up @@ -67,8 +67,11 @@ int screen_readkey()

void screen_exit()
{
if( backgroundMode == false )
endwin();
if (!screen_inited) {
return;
}

endwin();
}

void screen_show_errors() {
Expand Down Expand Up @@ -96,7 +99,7 @@ void screen_clear()
printf("\033[2J");
}

void screen_set_exename(char * exe_name)
void screen_set_exename(const char* exe_name)
{
strcpy(screen_exename, exe_name);
}
Expand Down
Loading