Add null checking

Change-Id: If09a6d5aec51f41b1963731fc852ce44ef54a7ed
Signed-off-by: Hyunsoo Park <hance.park@samsung.com>

diff --git a/packaging/capi-media-screen-mirroring.spec b/packaging/capi-media-screen-mirroring.spec
index 89381f3b041bbf34f89bc99460ae229e20748896..c1cf274409966a29c44c983a51021d34d61cbe6c 100644 (file)
--- a/packaging/capi-media-screen-mirroring.spec
+++ b/packaging/capi-media-screen-mirroring.spec
@@ -1,6 +1,6 @@
 Name:       capi-media-screen-mirroring
 Summary:    A screen mirroring library in Tizen C API
-Version:    0.2.12
+Version:    0.2.13
 Release:    1
 Group:      Multimedia/API
 License:    Apache-2.0

diff --git a/src/scmirroring_src.c b/src/scmirroring_src.c
index 803f8e16e9bb1f15f68079d208be8abc2cf55a34..8eff8cca14aa548e87a6143928d9a587748568be 100644 (file)
--- a/src/scmirroring_src.c
+++ b/src/scmirroring_src.c
@@ -488,8 +488,7 @@ int scmirroring_src_connect(scmirroring_src_h scmirroring)
        /* Connecting to the miracast server */
        memset(&serv_addr, 0, sizeof(struct sockaddr_un));
        serv_addr.sun_family = AF_UNIX;
-       strncpy(serv_addr.sun_path, _scmirroring->sock_path, sizeof(serv_addr.sun_path));
-       serv_addr.sun_path[sizeof(serv_addr.sun_path) - 1] = '\0';
+       g_strlcpy(serv_addr.sun_path, _scmirroring->sock_path, sizeof(serv_addr.sun_path));
 
 try:
        scmirroring_debug("Trying to connect to the miracast server");

diff --git a/test_sink/scmirroring_primary_sink_test.c b/test_sink/scmirroring_primary_sink_test.c
index a28c444e677ea9dd3da8efda76d92584b241aa59..6bf9b082e2315267e561771ddc8ee40e9debcf5e 100644 (file)
--- a/test_sink/scmirroring_primary_sink_test.c
+++ b/test_sink/scmirroring_primary_sink_test.c
@@ -906,6 +906,14 @@ static gboolean __input(GIOChannel *channel,
 
        g_io_channel_read_chars(channel, buf, MAX_STRING_LEN, &read, &error);
        buf[read] = '\0';
+
+       if (read == 0) {
+               g_print ("Read 0 bytes! \n");
+               return FALSE;
+       } else {
+               g_print ("Read %" G_GSIZE_FORMAT "bytes \n", read);
+       }
+
        g_strstrip(buf);
 
        if (g_menu == MAIN_MENU)

diff --git a/test_sink/scmirroring_sink_test.c b/test_sink/scmirroring_sink_test.c
index e34be72a00ad44b1f309c58c0ff292d282d04bce..14d219d872ddc75cec94857dcd1edccd9b9c8d49 100644 (file)
--- a/test_sink/scmirroring_sink_test.c
+++ b/test_sink/scmirroring_sink_test.c
@@ -850,6 +850,13 @@ static gboolean __input(GIOChannel *channel,
 
        g_io_channel_read_chars(channel, buf, MAX_STRING_LEN, &read, &error);
        buf[read] = '\0';
+       if (read == 0) {
+               g_print ("Read 0 bytes! \n");
+               return FALSE;
+       } else {
+               g_print ("Read %" G_GSIZE_FORMAT "bytes \n", read);
+       }
+
        g_strstrip(buf);
 
        if (g_menu == MAIN_MENU)

diff --git a/test_sink/scmirroring_sink_test_SBS.c b/test_sink/scmirroring_sink_test_SBS.c
index 309b70e4fa854fea5619808398f462410280fad8..1004a4195beaf73390c132c597e21f182388cb44 100644 (file)
--- a/test_sink/scmirroring_sink_test_SBS.c
+++ b/test_sink/scmirroring_sink_test_SBS.c
@@ -857,6 +857,14 @@ static gboolean __input(GIOChannel *channel,
 
        g_io_channel_read_chars(channel, buf, MAX_STRING_LEN, &read, &error);
        buf[read] = '\0';
+
+       if (read == 0) {
+               g_print ("Read 0 bytes! \n");
+               return FALSE;
+       } else {
+               g_print ("Read %" G_GSIZE_FORMAT "bytes \n", read);
+       }
+
        g_strstrip(buf);
 
        if (g_menu == MAIN_MENU)