From 0e98b8f57fd9eaa0f3fb10e9d70c289bbe01106d Mon Sep 17 00:00:00 2001
From: Matan Lurey <matan@lurey.org>
Date: Tue, 21 Nov 2023 14:50:20 -0800
Subject: [PATCH] shell/common

---
 shell/common/base64.cc                          | 4 ++++
 shell/common/shell_test_platform_view_vulkan.cc | 3 +--
 shell/common/shell_test_platform_view_vulkan.h  | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/shell/common/base64.cc b/shell/common/base64.cc
index 3232446705b39..5924f1ecd6cf6 100644
--- a/shell/common/base64.cc
+++ b/shell/common/base64.cc
@@ -131,10 +131,12 @@ size_t Base64::Encode(const void* srcv, size_t length, void* dstv) {
     c = (c >> 6 | b << 2) & 0x3F;
     b = (b >> 4 | a << 4) & 0x3F;
     a = a >> 2;
+    // NOLINTBEGIN(clang-analyzer-core.NullDereference)
     *dst++ = encode[a];
     *dst++ = encode[b];
     *dst++ = encode[c];
     *dst++ = encode[d];
+    // NOLINTEND(clang-analyzer-core.NullDereference)
   }
   if (remainder > 0) {
     int k1 = 0;
@@ -145,10 +147,12 @@ size_t Base64::Encode(const void* srcv, size_t length, void* dstv) {
       k1 = b >> 4;
       k2 = (b << 2) & 0x3F;
     }
+    // NOLINTBEGIN(clang-analyzer-core.NullDereference)
     *dst++ = encode[a >> 2];
     *dst++ = encode[(k1 | a << 4) & 0x3F];
     *dst++ = encode[k2];
     *dst++ = encode[EncodePad];
+    // NOLINTEND(clang-analyzer-core.NullDereference)
   }
   return EncodedSize(length);
 }
diff --git a/shell/common/shell_test_platform_view_vulkan.cc b/shell/common/shell_test_platform_view_vulkan.cc
index d8ce19114f140..11d9018d95f45 100644
--- a/shell/common/shell_test_platform_view_vulkan.cc
+++ b/shell/common/shell_test_platform_view_vulkan.cc
@@ -76,8 +76,7 @@ ShellTestPlatformViewVulkan::OffScreenSurface::OffScreenSurface(
     fml::RefPtr<vulkan::VulkanProcTable> vk,
     std::shared_ptr<ShellTestExternalViewEmbedder>
         shell_test_external_view_embedder)
-    : valid_(false),
-      vk_(std::move(vk)),
+    : vk_(std::move(vk)),
       shell_test_external_view_embedder_(
           std::move(shell_test_external_view_embedder)) {
   if (!vk_ || !vk_->HasAcquiredMandatoryProcAddresses()) {
diff --git a/shell/common/shell_test_platform_view_vulkan.h b/shell/common/shell_test_platform_view_vulkan.h
index e617ea3f7f9e2..6631b10b64082 100644
--- a/shell/common/shell_test_platform_view_vulkan.h
+++ b/shell/common/shell_test_platform_view_vulkan.h
@@ -50,7 +50,7 @@ class ShellTestPlatformViewVulkan : public ShellTestPlatformView {
     GrDirectContext* GetContext() override;
 
    private:
-    bool valid_;
+    bool valid_ = false;
     fml::RefPtr<vulkan::VulkanProcTable> vk_;
     std::shared_ptr<ShellTestExternalViewEmbedder>
         shell_test_external_view_embedder_;