From 27306568d5b6105cafea3ee0be69c7d2d95e6efb Mon Sep 17 00:00:00 2001 From: guoshengbang Date: Fri, 30 Aug 2024 19:55:33 +0800 Subject: [PATCH] remove sensitive info in log Signed-off-by: guoshengbang Change-Id: Iabcde3c5de36936dfa8daf02c0814be4dc9c950c --- services/print_service/src/print_cups_attribute.cpp | 7 ++++++- services/print_service/src/print_cups_client.cpp | 2 -- services/print_service/src/print_service_ability.cpp | 3 ++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/services/print_service/src/print_cups_attribute.cpp b/services/print_service/src/print_cups_attribute.cpp index b1680d87..1c2532db 100644 --- a/services/print_service/src/print_cups_attribute.cpp +++ b/services/print_service/src/print_cups_attribute.cpp @@ -202,7 +202,12 @@ void ParseQualityAttributes(ipp_t *response, PrinterCapability &printerCaps) std::vector list; for (int i = 0; i < ippGetCount(attrPtr); i++) { nlohmann::json jsonObject; - uint32_t value = ippGetInteger(attrPtr, i); + int quality = ippGetInteger(attrPtr, i); + if (quality < 0) { + PRINT_HILOGE("%{public}s meet error quality", keyword.c_str()); + continue; + } + uint32_t value = static_cast(quality); jsonObject["quality"] = value; supportedQualities.push_back(jsonObject); list.emplace_back(value); diff --git a/services/print_service/src/print_cups_client.cpp b/services/print_service/src/print_cups_client.cpp index 03aebcc8..ed44eeef 100644 --- a/services/print_service/src/print_cups_client.cpp +++ b/services/print_service/src/print_cups_client.cpp @@ -130,9 +130,7 @@ static void DeviceCb(const char *deviceClass, const char *deviceId, const char * { PRINT_HILOGI("Device: uri = %{public}s\n", deviceUri); PRINT_HILOGI("class = %{public}s\n", deviceClass); - PRINT_HILOGI("info = %{public}s\n", deviceInfo); PRINT_HILOGI("make-and-model = %{public}s\n", deviceMakeAndModel); - PRINT_HILOGI("device-id = %{public}s\n", deviceId); PRINT_HILOGI("location = %{public}s\n", deviceLocation); std::string printerUri(deviceUri); std::string printerMake(deviceMakeAndModel); diff --git a/services/print_service/src/print_service_ability.cpp b/services/print_service/src/print_service_ability.cpp index 9979cbd6..03a6e2ed 100644 --- a/services/print_service/src/print_service_ability.cpp +++ b/services/print_service/src/print_service_ability.cpp @@ -129,7 +129,8 @@ PrintServiceAbility::PrintServiceAbility(int32_t systemAbilityId, bool runOnCrea helper_(nullptr), isJobQueueBlocked_(false), currentUserId_(-1), - printAppCount_(0) + printAppCount_(0), + unloadCount_(0) {} PrintServiceAbility::~PrintServiceAbility() -- Gitee