diff options
| author | Steve McIntyre <steve@einval.com> | 2022-05-01 19:17:48 +0100 |
|---|---|---|
| committer | Steve McIntyre <steve@einval.com> | 2022-05-01 19:17:48 +0100 |
| commit | 64da2668f663378e8204d69ec944734ba617e420 (patch) | |
| tree | ac534462b4295a234d9b24c115734b4ff8e41819 /debian/patches/fix-32b-format-strings.patch | |
| parent | 84d9f457b893e90c9841386410a8a02b4c6c128c (diff) | |
| download | efi-boot-shim-64da2668f663378e8204d69ec944734ba617e420.tar.gz efi-boot-shim-64da2668f663378e8204d69ec944734ba617e420.zip | |
Update the 32-bit format patch after upstream review
Diffstat (limited to 'debian/patches/fix-32b-format-strings.patch')
| -rw-r--r-- | debian/patches/fix-32b-format-strings.patch | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/debian/patches/fix-32b-format-strings.patch b/debian/patches/fix-32b-format-strings.patch index df2f8633..c7d9f1e5 100644 --- a/debian/patches/fix-32b-format-strings.patch +++ b/debian/patches/fix-32b-format-strings.patch @@ -1,6 +1,6 @@ PR submitted at https://github.com/rhboot/shim/pull/464 -commit 88d5a4be2ccd2a75f96177682bc20d7dc4391291 +commit 475d5293608dd64955bc76dd6eb0f379b0c37b3e Author: Steve McIntyre <steve@einval.com> Date: Thu Apr 28 11:37:12 2022 +0100 @@ -24,7 +24,7 @@ Date: Thu Apr 28 11:37:12 2022 +0100 Signed-off-by: Steve McIntyre <steve@einval.com> diff --git a/post-process-pe.c b/post-process-pe.c -index 8414a5fa..e8c05486 100644 +index 44077bc5..daacf5ef 100644 --- a/post-process-pe.c +++ b/post-process-pe.c @@ -174,7 +174,7 @@ load_pe(const char *const file, void *const data, const size_t datasize, @@ -32,7 +32,7 @@ index 8414a5fa..e8c05486 100644 if (FileAlignment % 2 != 0) - errx(1, "%s: Invalid file alignment %ld", file, FileAlignment); -+ errx(1, "%s: Invalid file alignment %ld", file, (long)FileAlignment); ++ errx(1, "%s: Invalid file alignment %zu", file, FileAlignment); if (FileAlignment == 0) FileAlignment = 0x200; @@ -45,17 +45,20 @@ index 8414a5fa..e8c05486 100644 EFI_IMAGE_NUMBER_OF_DIRECTORY_ENTRIES); if (mul(sizeof(EFI_IMAGE_DATA_DIRECTORY), -@@ -234,11 +234,11 @@ load_pe(const char *const file, void *const data, const size_t datasize, +@@ -233,12 +233,12 @@ load_pe(const char *const file, void *const data, const size_t datasize, + if (mul(ctx->NumberOfRvaAndSizes, sizeof(EFI_IMAGE_DATA_DIRECTORY), &sz1)) debug(ERROR, - "ctx->NumberOfRvaAndSizes (%zu) * sizeof(EFI_IMAGE_DATA_DIRECTORY) overflows\n", +- "ctx->NumberOfRvaAndSizes (%zu) * sizeof(EFI_IMAGE_DATA_DIRECTORY) overflows\n", - ctx->NumberOfRvaAndSizes); -+ (size_t)ctx->NumberOfRvaAndSizes); ++ "ctx->NumberOfRvaAndSizes (%ld) * sizeof(EFI_IMAGE_DATA_DIRECTORY) overflows\n", ++ (unsigned long)ctx->NumberOfRvaAndSizes); else debug(ERROR, - "ctx->NumberOfRvaAndSizes (%zu) * sizeof(EFI_IMAGE_DATA_DIRECTORY) = %zu\n", +- "ctx->NumberOfRvaAndSizes (%zu) * sizeof(EFI_IMAGE_DATA_DIRECTORY) = %zu\n", - ctx->NumberOfRvaAndSizes, sz1); -+ (size_t)ctx->NumberOfRvaAndSizes, sz1); ++ "ctx->NumberOfRvaAndSizes (%ld) * sizeof(EFI_IMAGE_DATA_DIRECTORY) = %zu\n", ++ (unsigned long)ctx->NumberOfRvaAndSizes, sz1); debug(ERROR, "space after image header:%zu data directory size:%zu\n", sz0, sz1); |