Fix framework weekness issue 21/139721/1
authorSeokHoon Lee <andy.shlee@samsung.com>
Thu, 20 Jul 2017 07:36:47 +0000 (16:36 +0900)
committerSeokHoon Lee <andy.shlee@samsung.com>
Thu, 20 Jul 2017 07:37:07 +0000 (16:37 +0900)
- delete unnecessary null termination because g_strdup do.

Signed-off-by: SeokHoon Lee <andy.shlee@samsung.com>
Change-Id: I042820bec1d6b0842b4cdf4566c1ae91b7b2d2c8

miracast_server/miracast_server_impl.c
packaging/capi-media-screen-mirroring.spec
src/scmirroring_src.c

index 91400f994c731f6512b58aaac198b25fe2ccb52a..797496c71fa236f63c5e1df83540f7ee953ebb1f 100644 (file)
@@ -166,10 +166,11 @@ int __miracast_server_send_resp(MiracastServer *server, const gchar *cmd)
 {
        int ret = SCMIRRORING_ERROR_NONE;
        char *_cmd = NULL;
+       int _cmdLen = 0;
        int client_sock = -1;
 
-       if (server == NULL) {
-               scmirroring_error("OUT_OF_MEMORY");
+       if (server == NULL || cmd == NULL) {
+               scmirroring_error("Invaild server or cmd!");
                return SCMIRRORING_ERROR_INVALID_OPERATION;
        }
 
@@ -180,9 +181,13 @@ int __miracast_server_send_resp(MiracastServer *server, const gchar *cmd)
        }
 
        _cmd = g_strdup(cmd);
-       _cmd[strlen(_cmd)] = '\0';
+       if (_cmd == NULL) {
+               scmirroring_error("Faild in g_strdup for cmd!");
+               return SCMIRRORING_ERROR_OUT_OF_MEMORY;
+       }
 
-       if (write(client_sock, _cmd, strlen(_cmd) + 1) != ((int)(strlen(_cmd) + 1))) {
+       _cmdLen = strlen(_cmd) + 1;
+       if (write(client_sock, _cmd, _cmdLen) != _cmdLen) {
                char buf[255] = {0, };
                strerror_r(errno, buf, sizeof(buf));
                scmirroring_error("sendto failed [%s]", buf);
index 1f5f3713371c53f4a6db50ab7fb9286a3f7ff207..beffe65f1345ec7ce01be27c36b9cb08b8e4dc65 100644 (file)
@@ -1,6 +1,6 @@
 Name:       capi-media-screen-mirroring
 Summary:    A screen mirroring library in Tizen C API
-Version:    0.1.83
+Version:    0.1.84
 Release:    0
 Group:      Multimedia/API
 License:    Apache-2.0
index b771e0cb0acea9080cfed82abb3249f78c433349..6d97bff4ffe24a2e29148f391aa6b84b88ee37f2 100644 (file)
@@ -64,6 +64,7 @@ static int __scmirroring_src_send_cmd_to_server(scmirroring_src_s *scmirroring,
 {
        int ret = SCMIRRORING_ERROR_NONE;
        char *_cmd = NULL;
+       int _cmdLen = 0;
 
        scmirroring_retvm_if(scmirroring == NULL, SCMIRRORING_ERROR_INVALID_PARAMETER, "scmirroring is NULL");
        scmirroring_retvm_if(cmd == NULL, SCMIRRORING_ERROR_INVALID_PARAMETER, "cmd is NULL");
@@ -74,9 +75,8 @@ static int __scmirroring_src_send_cmd_to_server(scmirroring_src_s *scmirroring,
                return SCMIRRORING_ERROR_OUT_OF_MEMORY;
        }
 
-       _cmd[strlen(_cmd)] = '\0';
-
-       if (write(scmirroring->sock, _cmd, strlen(_cmd) + 1) != (signed int) strlen(_cmd) + 1) {
+       _cmdLen = strlen(_cmd) + 1;
+       if (write(scmirroring->sock, _cmd, _cmdLen) != _cmdLen) {
                char buf[255] = {0, };
                strerror_r(errno, buf, sizeof(buf));
                scmirroring_error("sendto failed [%s]", buf);