Check the packet length while parsing it.

Change-Id: Iac9a811ca3667b5101b71c63a2cf350680941f0b

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 60cc4c4..61eb788 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,8 +23,8 @@ FOREACH(flag ${pkgs_CFLAGS})
        SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
 ENDFOREACH(flag)
 
-SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -fvisibility=hidden")
-SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -g")
+SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -fvisibility=hidden -g -Wall -Werror -Winline")
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}")
 
 ADD_DEFINITIONS("-DPREFIX=\"${PREFIX}\"")
 ADD_DEFINITIONS("-DLOG_TAG=\"${PROJECT_NAME}\"")

diff --git a/src/com-core_packet.c b/src/com-core_packet.c
index 1c79f2b..dc96339 100644 (file)
--- a/src/com-core_packet.c
+++ b/src/com-core_packet.c
@@ -4,6 +4,7 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include <fcntl.h>
+#include <sys/time.h>
 
 #include <glib.h>
 #include <dlog.h>

diff --git a/src/packet.c b/src/packet.c
index d511316..efaa45d 100644 (file)
--- a/src/packet.c
+++ b/src/packet.c
@@ -299,7 +299,7 @@ EAPI struct packet *packet_create_noack(const char *cmd, const char *fmt, ...)
        result->data->head.seq = s_info.seq++;
        result->data->head.type = PACKET_REQ_NOACK;
        result->data->head.version = PACKET_VERSION;
-       strcpy(result->data->head.command, cmd);
+       strncpy(result->data->head.command, cmd, sizeof(result->data->head.command));
        result->data->head.payload_size = 0;
        payload_size -= sizeof(*result->data);
 
@@ -327,7 +327,7 @@ EAPI int packet_get(const struct packet *packet, const char *fmt, ...)
        va_start(va, fmt);
 
        ptr = fmt;
-       while (*ptr) {
+       while (*ptr && offset < packet->data->head.payload_size) {
                payload = packet->data->payload + offset;
                switch (*ptr) {
                case 'i':

diff --git a/src/secure_socket.c b/src/secure_socket.c
index e43b71e..eabd5ee 100644 (file)
--- a/src/secure_socket.c
+++ b/src/secure_socket.c
@@ -154,6 +154,11 @@ EAPI int secure_socket_send(int handle, const char *buffer, int size)
        struct iovec iov;
        int ret;
 
+       if (!buffer || size <= 0) {
+               ErrPrint("Reject: 0 byte data sending\n");
+               return -1;
+       }
+
        memset(&msg, 0, sizeof(msg));
        iov.iov_base = (char *)buffer;
        iov.iov_len = size;
@@ -180,7 +185,7 @@ EAPI int secure_socket_recv(int handle, char *buffer, int size, int *sender_pid)
        struct iovec iov;
        char control[1024];
 
-       if (!sender_pid)
+       if (!sender_pid || size <= 0 || !buffer)
                return -1;
 
        memset(&msg, 0, sizeof(msg));