From b8c367d6c4f5c48ac8ea3fa53a9dd34456e2c2c6 Mon Sep 17 00:00:00 2001
From: Philippe PITTOLI
Date: Mon, 19 Dec 2016 22:49:26 +0100
Subject: [PATCH] =?UTF-8?q?corrections=20m=C3=A9moire?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
core-test/app/Makefile | 2 +-
core-test/app/benchmark_usock-client.c | 6 ++++--
core-test/app/benchmark_usock-server.c | 8 +++++---
core-test/app/communication-client.c | 3 +++
core-test/app/communication-server.c | 4 ++++
core-test/app/usock-client.c | 5 ++++-
core-test/app/usock-server.c | 7 +++++--
core/communication.c | 9 +++++++--
core/usocket.c | 2 +-
9 files changed, 34 insertions(+), 12 deletions(-)
diff --git a/core-test/app/Makefile b/core-test/app/Makefile
index c398f8c..6972c25 100644
--- a/core-test/app/Makefile
+++ b/core-test/app/Makefile
@@ -16,7 +16,7 @@ $(EXEC): $(OBJECTS) $(CFILES)
$(CC) -c $(CFLAGS) $< -o $@
$(TESTS):
- valgrind --show-leak-kinds=all --leak-check=full -v --track-origins=yes ./$(basename $@)
+ valgrind --show-leak-kinds=all --leak-check=full -v --track-origins=yes ./$(basename $@).bin
clean:
@-rm $(OBJECTS)
diff --git a/core-test/app/benchmark_usock-client.c b/core-test/app/benchmark_usock-client.c
index ef6fd98..4e9fe60 100644
--- a/core-test/app/benchmark_usock-client.c
+++ b/core-test/app/benchmark_usock-client.c
@@ -13,11 +13,10 @@
int main (int argc, char * argv[])
{
-
argc = argc;
argv = argv;
- int fd;
+ int fd = 0;
size_t msize = BUFSIZ;
char *buf = NULL;
@@ -55,5 +54,8 @@ int main (int argc, char * argv[])
return EXIT_FAILURE;
}
+ if (buf != NULL)
+ free (buf);
+
return EXIT_SUCCESS;
}
diff --git a/core-test/app/benchmark_usock-server.c b/core-test/app/benchmark_usock-server.c
index a50bd8f..1b2c40c 100644
--- a/core-test/app/benchmark_usock-server.c
+++ b/core-test/app/benchmark_usock-server.c
@@ -12,12 +12,11 @@
int main (int argc, char * argv[])
{
-
argc = argc;
argv = argv;
- int fd;
- int pfd;
+ int fd = 0;
+ int pfd = 0;
size_t msize = BUFSIZ;
char *buf = NULL;
@@ -63,5 +62,8 @@ int main (int argc, char * argv[])
return EXIT_FAILURE;
}
+ if (buf != NULL)
+ free (buf);
+
return EXIT_SUCCESS;
}
diff --git a/core-test/app/communication-client.c b/core-test/app/communication-client.c
index dde96c9..60ca591 100644
--- a/core-test/app/communication-client.c
+++ b/core-test/app/communication-client.c
@@ -53,5 +53,8 @@ int main (int argc, char *argv[], char *env[])
return EXIT_FAILURE;
}
+ if (buf != NULL)
+ free (buf);
+
return EXIT_SUCCESS;
}
diff --git a/core-test/app/communication-server.c b/core-test/app/communication-server.c
index af126ec..761e329 100644
--- a/core-test/app/communication-server.c
+++ b/core-test/app/communication-server.c
@@ -30,6 +30,7 @@ int main (int argc, char *argv[], char *env[])
srv.version = 0;
struct process p;
+ memset (&p, 0, sizeof (struct process));
// init service
if (srv_init (argc, argv, env, &srv, SERVICE_NAME) < 0) {
@@ -64,5 +65,8 @@ int main (int argc, char *argv[], char *env[])
return EXIT_FAILURE;
}
+ if (buf != NULL)
+ free (buf);
+
return EXIT_SUCCESS;
}
diff --git a/core-test/app/usock-client.c b/core-test/app/usock-client.c
index 1ce6514..b59ea26 100644
--- a/core-test/app/usock-client.c
+++ b/core-test/app/usock-client.c
@@ -16,7 +16,7 @@ int main (int argc, char * argv[])
argc = argc;
argv = argv;
- int fd;
+ int fd = 0;
size_t msize = BUFSIZ;
char *buf = NULL;
@@ -48,5 +48,8 @@ int main (int argc, char * argv[])
return EXIT_FAILURE;
}
+ if (buf != NULL)
+ free (buf);
+
return EXIT_SUCCESS;
}
diff --git a/core-test/app/usock-server.c b/core-test/app/usock-server.c
index ce3f1ea..cf8b17a 100644
--- a/core-test/app/usock-server.c
+++ b/core-test/app/usock-server.c
@@ -16,8 +16,8 @@ int main (int argc, char * argv[])
argc = argc;
argv = argv;
- int fd;
- int pfd;
+ int fd = 0;
+ int pfd = 0;
size_t msize = BUFSIZ;
char *buf = NULL;
@@ -67,5 +67,8 @@ int main (int argc, char * argv[])
return EXIT_FAILURE;
}
+ if (buf != NULL)
+ free (buf);
+
return EXIT_SUCCESS;
}
diff --git a/core/communication.c b/core/communication.c
index 95ff7b5..a42b774 100644
--- a/core/communication.c
+++ b/core/communication.c
@@ -47,7 +47,7 @@ int srv_init (int argc, char **argv, char **env
int srv_accept (struct service *srv, struct process *p)
{
usock_accept (srv->service_fd, &p->proc_fd);
- char *buf;
+ char *buf = NULL;
size_t msgsize = BUFSIZ;
srv_read (p, &buf, &msgsize);
@@ -57,6 +57,8 @@ int srv_accept (struct service *srv, struct process *p)
srv_write (p, buf, msgsize);
+ free (buf);
+
return 0;
}
@@ -104,13 +106,14 @@ int app_connection (int argc, char **argv, char **env
// TODO: connection algorithm
// send connection string and receive acknowledgement
char send_buffer [BUFSIZ];
+ memset (send_buffer, 0, BUFSIZ);
if (msg_format_con (send_buffer, connectionstr, &msize) < 0) {
handle_err ("app_connection", "msg_format_con");
return -1;
}
app_write (srv, send_buffer, msize);
- char *buffer;
+ char *buffer = NULL;
size_t read_msg_size = BUFSIZ;
app_read (srv, &buffer, &read_msg_size);
@@ -118,6 +121,8 @@ int app_connection (int argc, char **argv, char **env
assert (buffer[0] == MSG_TYPE_ACK);
assert (read_msg_size == 3);
+ free (buffer);
+
return 0;
}
diff --git a/core/usocket.c b/core/usocket.c
index b28dca2..57a8b0c 100644
--- a/core/usocket.c
+++ b/core/usocket.c
@@ -164,7 +164,7 @@ int usock_accept (int fd, int *pfd)
struct sockaddr_un peer_addr;
memset (&peer_addr, 0, sizeof (struct sockaddr_un));
- socklen_t peer_addr_size;
+ socklen_t peer_addr_size = 0;
*pfd = accept (fd, (struct sockaddr *) &peer_addr, &peer_addr_size);
if (*pfd < 0) {