diff options
| author | John Stultz <john.stultz@linaro.org> | 2018-12-19 21:00:15 -0800 |
|---|---|---|
| committer | Alistair Strachan <astrachan@google.com> | 2018-12-20 21:12:17 +0000 |
| commit | 5d32321b0bbc9a32d622ca4cbd42bd273381f096 (patch) | |
| tree | e49292284b5bc17246927451170287c7d0c728b4 | |
| parent | 829ea1ae4e36fb4aafc4ddeb506810233e98819e (diff) | |
| parent | 680c62d61bc28a17d3283976e3c3061cbec9993e (diff) | |
| download | edk2-5d32321b0bbc9a32d622ca4cbd42bd273381f096.tar.gz | |
Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into HEADandroid-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-q-preview-1android-o-mr1-iot-release-1.0.8android-o-mr1-iot-release-1.0.12android-o-mr1-iot-release-1.0.10oreo-mr1-iot-release
Merge in Offset multiplication overflow fix.
Change-Id: If4922eaa4af1cbfa1b4454c5aaea910324d3b85b
Signed-off-by: John Stultz <john.stultz@linaro.org>
| -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 (
|