commit: 38e9deb2dacc988801260f8ded292fe1c2b15f3f Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> AuthorDate: Mon Sep 12 17:21:04 2022 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Mon Sep 12 17:26:21 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38e9deb2
dev-util/radare2: remove unused patches Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> Portage 3.0.36 / pkgdev 0.2.1 / pkgcheck 0.10.14 Closes: https://github.com/gentoo/gentoo/pull/27227 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> dev-util/radare2/files/CVE-2022-1437.patch | 72 ---------------------- .../radare2/files/radare2-5.5.0-vector35.patch | 22 ------- 2 files changed, 94 deletions(-) diff --git a/dev-util/radare2/files/CVE-2022-1437.patch b/dev-util/radare2/files/CVE-2022-1437.patch deleted file mode 100644 index 16e67c5d3193..000000000000 --- a/dev-util/radare2/files/CVE-2022-1437.patch +++ /dev/null @@ -1,72 +0,0 @@ ---- a/libr/bin/format/mach0/coresymbolication.c -+++ b/libr/bin/format/mach0/coresymbolication.c -@@ -269,6 +269,9 @@ RCoreSymCacheElement *r_coresym_cache_element_new(RBinFile *bf, RBuffer *buf, ut - for (i = 0; i < hdr->n_sections && cursor < end; i++) { - ut8 *sect_start = cursor; - RCoreSymCacheElementSection *sect = &result->sections[i]; -+ if (cursor + (word_size * 4) > end) { -+ goto beach; -+ } - sect->vaddr = sect->paddr = r_read_ble (cursor, false, bits); - if (sect->vaddr < page_zero_size) { - sect->vaddr += page_zero_size; -@@ -359,6 +362,10 @@ RCoreSymCacheElement *r_coresym_cache_element_new(RBinFile *bf, RBuffer *buf, ut - continue; - } - string_origin = relative_to_strings? b + start_of_strings : cursor; -+ if (!string_origin) { -+ cursor += R_CS_EL_SIZE_LSYM; -+ continue; -+ } - lsym->flc.file = str_dup_safe (b, string_origin + file_name_off, end); - if (!lsym->flc.file) { - cursor += R_CS_EL_SIZE_LSYM; ---- a/libr/bin/p/bin_symbols.c -+++ b/libr/bin/p/bin_symbols.c -@@ -353,28 +353,30 @@ static bool check_buffer(RBinFile *bf, RBuffer *b) { - } - - static RList *symbols(RBinFile *bf) { -- RList *res = r_list_newf ((RListFree)r_bin_symbol_free); -- r_return_val_if_fail (res && bf->o && bf->o->bin_obj, res); -+ r_return_val_if_fail (bf && bf->o && bf->o->bin_obj, NULL); - RCoreSymCacheElement *element = bf->o->bin_obj; - size_t i; - HtUU *hash = ht_uu_new0 (); - if (!hash) { -- return res; -+ return NULL; - } -+ RList *res = r_list_newf ((RListFree)r_bin_symbol_free); - bool found = false; -- for (i = 0; i < element->hdr->n_lined_symbols; i++) { -- RCoreSymCacheElementSymbol *sym = (RCoreSymCacheElementSymbol *)&element->lined_symbols[i]; -- if (!sym) { -- break; -- } -- ht_uu_find (hash, sym->paddr, &found); -- if (found) { -- continue; -- } -- RBinSymbol *s = bin_symbol_from_symbol (element, sym); -- if (s) { -- r_list_append (res, s); -- ht_uu_insert (hash, sym->paddr, 1); -+ if (element->lined_symbols) { -+ for (i = 0; i < element->hdr->n_lined_symbols; i++) { -+ RCoreSymCacheElementSymbol *sym = (RCoreSymCacheElementSymbol *)&element->lined_symbols[i]; -+ if (!sym) { -+ break; -+ } -+ ht_uu_find (hash, sym->paddr, &found); -+ if (found) { -+ continue; -+ } -+ RBinSymbol *s = bin_symbol_from_symbol (element, sym); -+ if (s) { -+ r_list_append (res, s); -+ ht_uu_insert (hash, sym->paddr, 1); -+ } - } - } - if (element->symbols) { diff --git a/dev-util/radare2/files/radare2-5.5.0-vector35.patch b/dev-util/radare2/files/radare2-5.5.0-vector35.patch deleted file mode 100644 index 5ebf58020d4d..000000000000 --- a/dev-util/radare2/files/radare2-5.5.0-vector35.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/libr/asm/arch/arm/v35arm64/Makefile -+++ b/libr/asm/arch/arm/v35arm64/Makefile -@@ -30,8 +30,7 @@ $(ALIBS): arch-arm64 arch-armv7 - - ## ARM64 - arch-arm64: -- git clone -q https://github.com/radareorg/vector35-arch-arm64 arch-arm64 -- cd arch-arm64 && git checkout -q radare2 > /dev/null && git reset --hard $(ARCH_ARM64_COMMIT) -+ cd arch-arm64 - - $(V35ARM64_HOME)/arm64dis.a arm64dis.a: $(ALIBS) - rm -f arm64dis.$(EXT_AR) -@@ -40,8 +39,7 @@ $(V35ARM64_HOME)/arm64dis.a arm64dis.a: $(ALIBS) - - ## ARMV7 - arch-armv7: -- git clone -q https://github.com/radareorg/vector35-arch-armv7 arch-armv7 -- cd arch-armv7 && git checkout -q radare2 > /dev/null && git reset --hard $(ARCH_ARMV7_COMMIT) -+ cd arch-armv7 - - $(V35ARMV7_HOME)/armv7dis.a armv7dis.a: $(ALIBS) - rm -f armv7dis.$(EXT_AR)
