From f105be4577efe64cd9b534bf2c8eb66a9d42e82f Mon Sep 17 00:00:00 2001 From: faithwang Date: Mon, 5 Sep 2022 12:11:50 +0800 Subject: [PATCH 1/4] update jdwp Signed-off-by: faithwang --- src/daemon/jdwp.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/daemon/jdwp.cpp b/src/daemon/jdwp.cpp index 14675bdc..c06dfb6e 100644 --- a/src/daemon/jdwp.cpp +++ b/src/daemon/jdwp.cpp @@ -269,7 +269,8 @@ int HdcJdwp::UvPipeBind(uv_pipe_t* handle, const char* name, size_t size) } saddr.sun_path[capacity - 1] = '\0'; saddr.sun_family = AF_UNIX; - int err = bind(sockfd, reinterpret_cast(&saddr), sizeof saddr); + size_t saddrLen = sizeof(saddr.sun_family) + sizeof(name) - 1; + int err = bind(sockfd, reinterpret_cast(&saddr), saddrLen); if (err != 0) { strerror_r(errno, buffer, BUF_SIZE_DEFAULT); WRITE_LOG(LOG_FATAL, "bind failed errno:%d %s", errno, buffer); -- Gitee From 49ce060369ae01c587aa53f165712682a0db4148 Mon Sep 17 00:00:00 2001 From: faithwang Date: Mon, 5 Sep 2022 21:55:34 +0800 Subject: [PATCH 2/4] add log Signed-off-by: faithwang --- src/daemon/jdwp.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/daemon/jdwp.cpp b/src/daemon/jdwp.cpp index c06dfb6e..89275816 100644 --- a/src/daemon/jdwp.cpp +++ b/src/daemon/jdwp.cpp @@ -270,6 +270,7 @@ int HdcJdwp::UvPipeBind(uv_pipe_t* handle, const char* name, size_t size) saddr.sun_path[capacity - 1] = '\0'; saddr.sun_family = AF_UNIX; size_t saddrLen = sizeof(saddr.sun_family) + sizeof(name) - 1; + WRITE_LOG(LOG_INFO, "saddrLen:%u", saddrLen); int err = bind(sockfd, reinterpret_cast(&saddr), saddrLen); if (err != 0) { strerror_r(errno, buffer, BUF_SIZE_DEFAULT); -- Gitee From 9b341cfe50a01bfbaa87ac310d6725692724bf04 Mon Sep 17 00:00:00 2001 From: faithwang Date: Tue, 6 Sep 2022 09:53:59 +0800 Subject: [PATCH 3/4] fix size Signed-off-by: faithwang --- src/daemon/jdwp.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/daemon/jdwp.cpp b/src/daemon/jdwp.cpp index 89275816..2811e998 100644 --- a/src/daemon/jdwp.cpp +++ b/src/daemon/jdwp.cpp @@ -269,7 +269,7 @@ int HdcJdwp::UvPipeBind(uv_pipe_t* handle, const char* name, size_t size) } saddr.sun_path[capacity - 1] = '\0'; saddr.sun_family = AF_UNIX; - size_t saddrLen = sizeof(saddr.sun_family) + sizeof(name) - 1; + size_t saddrLen = sizeof(saddr.sun_family) + size - 1; WRITE_LOG(LOG_INFO, "saddrLen:%u", saddrLen); int err = bind(sockfd, reinterpret_cast(&saddr), saddrLen); if (err != 0) { -- Gitee From b692b3aa6c8848f9d1724a3a3be869a3f1723331 Mon Sep 17 00:00:00 2001 From: faithwang Date: Tue, 6 Sep 2022 10:55:54 +0800 Subject: [PATCH 4/4] delete log Signed-off-by: faithwang --- src/daemon/jdwp.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/daemon/jdwp.cpp b/src/daemon/jdwp.cpp index 2811e998..313de510 100644 --- a/src/daemon/jdwp.cpp +++ b/src/daemon/jdwp.cpp @@ -270,7 +270,6 @@ int HdcJdwp::UvPipeBind(uv_pipe_t* handle, const char* name, size_t size) saddr.sun_path[capacity - 1] = '\0'; saddr.sun_family = AF_UNIX; size_t saddrLen = sizeof(saddr.sun_family) + size - 1; - WRITE_LOG(LOG_INFO, "saddrLen:%u", saddrLen); int err = bind(sockfd, reinterpret_cast(&saddr), saddrLen); if (err != 0) { strerror_r(errno, buffer, BUF_SIZE_DEFAULT); -- Gitee