diff options
| author | John Stultz <john.stultz@linaro.org> | 2018-12-20 22:00:32 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-12-20 22:00:32 -0800 |
| commit | dc8f79e73d48b3d9955d80136261a0e7b617a729 (patch) | |
| tree | e49292284b5bc17246927451170287c7d0c728b4 | |
| parent | 44fb46099355c1052d207dba085215191b68bae3 (diff) | |
| parent | d611cb9b25276ac4650b1aaf9ee0155f90164e8d (diff) | |
| download | edk2-dc8f79e73d48b3d9955d80136261a0e7b617a729.tar.gz | |
Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into HEAD am: 5d32321b0b
am: d611cb9b25
Change-Id: Ib9527e947d8d199958f128f71c4f77bcc3f0d86c
| -rw-r--r-- | EmbeddedPkg/Application/AndroidFastboot/AndroidFastbootApp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/EmbeddedPkg/Application/AndroidFastboot/AndroidFastbootApp.c b/EmbeddedPkg/Application/AndroidFastboot/AndroidFastbootApp.c index 9074c6c77..854157161 100644 --- a/EmbeddedPkg/Application/AndroidFastboot/AndroidFastbootApp.c +++ b/EmbeddedPkg/Application/AndroidFastboot/AndroidFastbootApp.c @@ -227,11 +227,11 @@ FlashSparseImage ( 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 @@ FlashSparseImage ( Image += sizeof (UINT32);
break;
case CHUNK_TYPE_DONT_CARE:
- Offset += ChunkHeader->ChunkSize * SparseHeader->BlockSize;
+ Offset += (UINTN)ChunkHeader->ChunkSize * SparseHeader->BlockSize;
break;
default:
UnicodeSPrint (
|