commit eea7066883c3d0c4436b3f3ee21c3f0bb8cc1d3e
author android-build-team Robot <android-build-team-robot@google.com> Sun Dec 23 04:12:31 2018 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Sun Dec 23 04:12:31 2018 +0000
tree e49292284b5bc17246927451170287c7d0c728b4
parent a5fb07726f7d11c3ee97de78858916f9253920e9
parent a2ef145276a58bad1b026793dcd8f3445574bd02

Snap for 5198681 from a2ef145276a58bad1b026793dcd8f3445574bd02 to qt-release

Change-Id: Ida0c8a05cc5560967fc8295a6c278de6adc2ee8f

EmbeddedPkg/Application/AndroidFastboot/AndroidFastbootApp.c

diff --git a/EmbeddedPkg/Application/AndroidFastboot/AndroidFastbootApp.c b/EmbeddedPkg/Application/AndroidFastboot/AndroidFastbootApp.c
index 9074c6c..8541571 100644
--- a/EmbeddedPkg/Application/AndroidFastboot/AndroidFastbootApp.c
+++ b/EmbeddedPkg/Application/AndroidFastboot/AndroidFastbootApp.c
@@ -227,11 +227,11 @@
       if (EFI_ERROR (Status)) {

         return Status;

       }

-      Image += ChunkHeader->ChunkSize * SparseHeader->BlockSize;

-      Offset += ChunkHeader->ChunkSize * SparseHeader->BlockSize;

+      Image += (UINTN)ChunkHeader->ChunkSize * SparseHeader->BlockSize;

+      Offset += (UINTN)ChunkHeader->ChunkSize * SparseHeader->BlockSize;

       break;

     case CHUNK_TYPE_FILL:

-      Left = ChunkHeader->ChunkSize * SparseHeader->BlockSize;

+      Left = (UINTN)ChunkHeader->ChunkSize * SparseHeader->BlockSize;

       while (Left > 0) {

         if (Left > FILL_BUF_SIZE) {

           Count = FILL_BUF_SIZE;

@@ -254,7 +254,7 @@
       Image += sizeof (UINT32);

       break;

     case CHUNK_TYPE_DONT_CARE:

-      Offset += ChunkHeader->ChunkSize * SparseHeader->BlockSize;

+      Offset += (UINTN)ChunkHeader->ChunkSize * SparseHeader->BlockSize;

       break;

     default:

       UnicodeSPrint (