!625 fix issue

Merge pull request !625 from Grady/master

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_) {

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;

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;