fonts: Dont memcpy with nullptr in SkRemoteGlyphCache

The behaviour is undefined and causes ASAN bots to complain.

Bug: skia:7515
Change-Id: I454714ab9047a6fced5ab7bfdbc12214d728eadf
Reviewed-on: https://skia-review.googlesource.com/125029
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Khusal Sagar <khushalsagar@chromium.org>

1 files changed, 7 insertions, 7 deletions

diff --git a/src/core/SkRemoteGlyphCache.cpp b/src/core/SkRemoteGlyphCache.cpp
index e45421aa05..06db562a9f 100644
--- a/src/core/SkRemoteGlyphCache.cpp
+++ b/src/core/SkRemoteGlyphCache.cpp
@@ -549,8 +549,8 @@ void SkStrikeServer::SkGlyphCacheState::writePendingGlyphs(Serializer* serialize
 
 class SkStrikeClient::DiscardableStrikePinner : public SkStrikePinner {
 public:
-    DiscardableStrikePinner(SkDiscardableHandleId discardableHandleId,
-                            sk_sp<DiscardableHandleManager> manager)
+    DiscardableStrikePinner(
+            SkDiscardableHandleId discardableHandleId, sk_sp<DiscardableHandleManager> manager)
             : fDiscardableHandleId(discardableHandleId), fManager(std::move(manager)) {}
 
     ~DiscardableStrikePinner() override = default;
@@ -635,17 +635,17 @@ bool SkStrikeClient::readStrikeData(const volatile void* memory, size_t memorySi
             SkGlyph glyph;
             if (!deserializer.read<SkGlyph>(&glyph)) READ_FAILURE
 
+            SkGlyph* allocatedGlyph = strike->getRawGlyphByID(glyph.getPackedID());
+            *allocatedGlyph = glyph;
+
             ArraySlice<uint8_t> image;
             auto imageSize = glyph.computeImageSize();
             if (imageSize != 0) {
                 image = deserializer.readArray<uint8_t>(imageSize);
                 if (!image.data()) READ_FAILURE
+                allocatedGlyph->allocImage(strike->getAlloc());
+                memcpy(allocatedGlyph->fImage, image.data(), image.size());
             }
-
-            SkGlyph* allocatedGlyph = strike->getRawGlyphByID(glyph.getPackedID());
-            *allocatedGlyph = glyph;
-            allocatedGlyph->allocImage(strike->getAlloc());
-            memcpy(allocatedGlyph->fImage, image.data(), image.size());
         }
     }