all repos — mgba @ d46f12aa8efbd194136d305bf2cb37e3e499b4af

mGBA Game Boy Advance Emulator

Util: Fix crash reading invalid ELFs
Vicki Pfau vi@endrift.com
Fri, 31 Jan 2020 18:03:48 -0800
commit

d46f12aa8efbd194136d305bf2cb37e3e499b4af

parent

d270a42de8c19c73ef1eeaca165b458673139260

2 files changed, 4 insertions(+), 0 deletions(-)

jump to
M CHANGESCHANGES

@@ -23,6 +23,7 @@ - Qt: Fix missing OSD messages

- Qt: Fix crash unloading shaders - Qt: Fix toggled actions on gamepads (fixes mgba.io/i/1650) - Qt: Fix extraneous dialog (fixes mgba.io/i/1654) + - Util: Fix crash reading invalid ELFs Misc: - Qt: Renderer can be changed while a game is running
M src/util/elf-read.csrc/util/elf-read.c

@@ -84,6 +84,9 @@ void ELFGetProgramHeaders(struct ELF* elf, struct ELFProgramHeaders* ph) {

ELFProgramHeadersClear(ph); Elf32_Ehdr* hdr = elf32_getehdr(elf->e); Elf32_Phdr* phdr = elf32_getphdr(elf->e); + if (!hdr || !phdr) { + return; + } ELFProgramHeadersResize(ph, hdr->e_phnum); memcpy(ELFProgramHeadersGetPointer(ph, 0), phdr, sizeof(*phdr) * hdr->e_phnum); }