From f58c69efc2493453a7225a157c19a3fb94e1aff3 Mon Sep 17 00:00:00 2001 From: maosiping Date: Wed, 23 Mar 2022 17:51:18 +0800 Subject: [PATCH] =?UTF-8?q?fixed=2090a68e3=20from=20https://gitee.com/maos?= =?UTF-8?q?iping/communication=5Fnetstack/pulls/85=20=E5=AE=89=E5=85=A8?= =?UTF-8?q?=E5=90=88=E8=A7=84=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: maosiping --- frameworks/js/builtin/fetch_module.cpp | 2 +- frameworks/js/builtin/http_request/http_async_callback.cpp | 1 + frameworks/js/builtin/http_request/http_request.cpp | 2 +- .../js/napi/http/async_context/src/request_context.cpp | 2 +- frameworks/js/napi/http/http_exec/src/http_exec.cpp | 5 +++-- utils/log/include/netstack_log.h | 1 + 6 files changed, 8 insertions(+), 5 deletions(-) diff --git a/frameworks/js/builtin/fetch_module.cpp b/frameworks/js/builtin/fetch_module.cpp index 05143e946..b40eb10b0 100644 --- a/frameworks/js/builtin/fetch_module.cpp +++ b/frameworks/js/builtin/fetch_module.cpp @@ -73,7 +73,7 @@ bool FetchModule::JsObjectToRequestData(JSIValue options, RequestData *req) if (urlString == nullptr) { return false; } - HTTP_REQUEST_INFO("request url is %s", urlString.get()); + HTTP_REQUEST_INFO("request url is ..."); req->SetUrl(urlString.get()); req->SetMethod(GetMethodFromOptions(options)); diff --git a/frameworks/js/builtin/http_request/http_async_callback.cpp b/frameworks/js/builtin/http_request/http_async_callback.cpp index 6f84fca81..bb3fc5aa9 100644 --- a/frameworks/js/builtin/http_request/http_async_callback.cpp +++ b/frameworks/js/builtin/http_request/http_async_callback.cpp @@ -87,6 +87,7 @@ JSIValue HttpAsyncCallback::ResponseDataToJsValue(const ResponseData &responseDa std::unique_ptr headers(JSI::CreateObject(), JSI::ReleaseValue); if (headers == nullptr) { JSI::ReleaseValue(object); + return JSI::CreateUndefined(); } for (const auto &p : responseData.GetHeaders()) { JSI::SetStringProperty(headers.get(), p.first.c_str(), p.second.c_str()); diff --git a/frameworks/js/builtin/http_request/http_request.cpp b/frameworks/js/builtin/http_request/http_request.cpp index 8c83441e7..b1673c390 100644 --- a/frameworks/js/builtin/http_request/http_request.cpp +++ b/frameworks/js/builtin/http_request/http_request.cpp @@ -150,7 +150,7 @@ bool HttpRequest::SetOption(RequestData *requestData, CURL *curl, ResponseData * requestData->SetHeader(HttpConstant::HTTP_HEADER_KEY_CONTENT_TYPE, HttpConstant::HTTP_CONTENT_TYPE_URL_ENCODE); } - HTTP_REQUEST_INFO("final url: %s", requestData->GetUrl().c_str()); + HTTP_REQUEST_INFO("final url: ..."); ACE_CURL_EASY_SET_OPTION(curl, CURLOPT_URL, requestData->GetUrl().c_str(), responseData); return true; } diff --git a/frameworks/js/napi/http/async_context/src/request_context.cpp b/frameworks/js/napi/http/async_context/src/request_context.cpp index 1a21b5e65..9958dccc5 100644 --- a/frameworks/js/napi/http/async_context/src/request_context.cpp +++ b/frameworks/js/napi/http/async_context/src/request_context.cpp @@ -163,7 +163,7 @@ bool RequestContext::ParseExtraData(napi_value optionsValue) auto names = NapiUtils::GetPropertyNames(GetEnv(), extraData); std::for_each(names.begin(), names.end(), [this, extraData, &extraParam](std::string name) { auto value = NapiUtils::GetStringPropertyUtf8(GetEnv(), extraData, name); - NETSTACK_LOGI("url param name = %{public}s, value = %{public}s", name.c_str(), value.c_str()); + NETSTACK_LOGI("url param name = ..., value = ..."); if (!name.empty() && !value.empty()) { bool encodeName = HttpExec::EncodeUrlParam(name); bool encodeValue = HttpExec::EncodeUrlParam(value); diff --git a/frameworks/js/napi/http/http_exec/src/http_exec.cpp b/frameworks/js/napi/http/http_exec/src/http_exec.cpp index 0f155f263..834321409 100644 --- a/frameworks/js/napi/http/http_exec/src/http_exec.cpp +++ b/frameworks/js/napi/http/http_exec/src/http_exec.cpp @@ -77,7 +77,7 @@ bool HttpExec::ExecRequest(RequestContext *context) return false; } - NETSTACK_LOGI("final url: %{public}s", context->options.GetUrl().c_str()); + NETSTACK_LOGI("final url: ..."); std::vector vec; std::for_each(context->options.GetHeader().begin(), context->options.GetHeader().end(), @@ -183,7 +183,8 @@ bool HttpExec::EncodeUrlParam(std::string &str) { char encoded[4]; std::string encodeOut; - for (size_t i = 0; i < strlen(str.c_str()); ++i) { + size_t length = strlen(str.c_str()); + for (size_t i = 0; i < length; ++i) { auto c = static_cast(str.c_str()[i]); if (IsUnReserved(c)) { encodeOut += static_cast(c); diff --git a/utils/log/include/netstack_log.h b/utils/log/include/netstack_log.h index fcd86aa9c..3d20358cb 100644 --- a/utils/log/include/netstack_log.h +++ b/utils/log/include/netstack_log.h @@ -63,6 +63,7 @@ static void NetStackPrintLog(const char *fmt, ...) char buf[NETSTACK_MAX_BUFFER_SIZE] = {0}; int ret = vsnprintf_s(buf, sizeof(buf), sizeof(buf) - 1, newFmt.c_str(), args); if (ret < 0) { + va_end(args); return; } va_end(args); -- Gitee