From 1407443fd04d4dac5c6ec1018c8580f82f2ec3ee Mon Sep 17 00:00:00 2001
From: Grady <yangguangwei4@huawei.com>
Date: Tue, 22 Mar 2022 19:46:25 +0800
Subject: [PATCH] fix issues

Signed-off-by: Grady <yangguangwei4@huawei.com>
Change-Id: Ibffffcfe94d4e3bb4f70c9e201109ab61aa874a8
---
 dmserver/src/abstract_display_controller.cpp   | 8 ++++++++
 dmserver/src/abstract_screen.cpp               | 4 ++++
 wmserver/src/window_snapshot/snapshot_stub.cpp | 2 +-
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/dmserver/src/abstract_display_controller.cpp b/dmserver/src/abstract_display_controller.cpp
index c9b6c3f1..1ba4ffe3 100644
--- a/dmserver/src/abstract_display_controller.cpp
+++ b/dmserver/src/abstract_display_controller.cpp
@@ -350,6 +350,10 @@ bool AbstractDisplayController::UpdateDisplaySize(sptr<AbstractDisplay> absDispl
 
 void AbstractDisplayController::BindAloneScreenLocked(sptr<AbstractScreen> realAbsScreen)
 {
+    if (realAbsScreen == nullptr) {
+        WLOGE("BindAloneScreenLocked failed, realAbsScreen is nullptr");
+        return;
+    }
     ScreenId defaultScreenId = abstractScreenController_->GetDefaultAbstractScreenId();
     if (defaultScreenId != SCREEN_ID_INVALID) {
         if (defaultScreenId != realAbsScreen->dmsId_) {
@@ -390,6 +394,10 @@ void AbstractDisplayController::AddScreenToMirrorLocked(sptr<AbstractScreen> abs
 
 void AbstractDisplayController::AddScreenToExpandLocked(sptr<AbstractScreen> absScreen)
 {
+    if (absScreen == nullptr) {
+        WLOGE("AddScreenToExpandLocked failed, absScreen is nullptr");
+        return;
+    }
     for (auto iter = abstractDisplayMap_.begin(); iter != abstractDisplayMap_.end(); iter++) {
         sptr<AbstractDisplay> abstractDisplay = iter->second;
         if (abstractDisplay->GetAbstractScreenId() == absScreen->dmsId_) {
diff --git a/dmserver/src/abstract_screen.cpp b/dmserver/src/abstract_screen.cpp
index 46d0b732..f124f08a 100644
--- a/dmserver/src/abstract_screen.cpp
+++ b/dmserver/src/abstract_screen.cpp
@@ -182,6 +182,10 @@ DMError AbstractScreen::SetScreenColorTransform()
 
 void AbstractScreen::FillScreenInfo(sptr<ScreenInfo> info) const
 {
+    if (info == nullptr) {
+        WLOGE("FillScreenInfo failed! info is nullptr");
+        return;
+    }
     info->id_ = dmsId_;
     uint32_t width = 0;
     uint32_t height = 0;
diff --git a/wmserver/src/window_snapshot/snapshot_stub.cpp b/wmserver/src/window_snapshot/snapshot_stub.cpp
index f139aa65..d2ca4a77 100644
--- a/wmserver/src/window_snapshot/snapshot_stub.cpp
+++ b/wmserver/src/window_snapshot/snapshot_stub.cpp
@@ -27,7 +27,7 @@ namespace {
 int32_t SnapshotStub::OnRemoteRequest(uint32_t code, MessageParcel &data, MessageParcel &reply,
     MessageOption &option)
 {
-    WLOGFI("SnapshotStub::OnRemoteRequest code is %{public}d", code);
+    WLOGFI("SnapshotStub::OnRemoteRequest code is %{public}u", code);
     if (data.ReadInterfaceToken() != GetDescriptor()) {
         WLOGFE("InterfaceToken check failed!");
         return -1;