diff options
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/patches/cast-CHAR8-string-handling.patch | 25 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 31 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 65af73bb..7e110707 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,7 +10,11 @@ shim (15+1613861442.888f5b5-1) unstable; urgency=medium - uname.patch - use_compare_mem_gcc9.patch * New patches: - + Trivial change to remove bashisms in Make.coverity + + fix-Make.coverity-bashisms.patch + (Trivial changes to remove bashisms in Make.coverity) + + cast-CHAR8-string-handling.patch + (Cast CHAR8 strings to use (const char *) when using string + functions) * Switch to using gcc-10 rather than gcc-9. Closes: #978521 -- Steve McIntyre <93sam@debian.org> Sun, 21 Feb 2021 13:50:16 +0100 diff --git a/debian/patches/cast-CHAR8-string-handling.patch b/debian/patches/cast-CHAR8-string-handling.patch new file mode 100644 index 00000000..e92c8534 --- /dev/null +++ b/debian/patches/cast-CHAR8-string-handling.patch @@ -0,0 +1,25 @@ +diff --git a/sbat.c b/sbat.c +index 446bed1a..0946dfbb 100644 +--- a/sbat.c ++++ b/sbat.c +@@ -154,7 +154,8 @@ verify_single_entry(struct sbat_entry *entry, struct sbat_var *sbat_var_entry) + { + UINT16 sbat_gen, sbat_var_gen; + +- if (strcmp(entry->component_name, sbat_var_entry->component_name) == 0) { ++ if (strcmp((const char *)entry->component_name, ++ (const char *)sbat_var_entry->component_name) == 0) { + dprint(L"component %a has a matching SBAT variable entry, verifying\n", + entry->component_name); + +@@ -162,8 +163,8 @@ verify_single_entry(struct sbat_entry *entry, struct sbat_var *sbat_var_entry) + * atoi returns zero for failed conversion, so essentially + * badly parsed component_generation will be treated as zero + */ +- sbat_gen = atoi(entry->component_generation); +- sbat_var_gen = atoi(sbat_var_entry->component_generation); ++ sbat_gen = atoi((const char *)entry->component_generation); ++ sbat_var_gen = atoi((const char *)sbat_var_entry->component_generation); + + if (sbat_gen < sbat_var_gen) { + dprint(L"component %a, generation %d, was revoked by SBAT variable", diff --git a/debian/patches/series b/debian/patches/series index 30f25719..b14293cd 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ fix-Make.coverity-bashisms.patch +cast-CHAR8-string-handling.patch |