diff options
| author | Moritz Angermann <moritz.angermann@gmail.com> | 2017-04-21 12:12:01 -0400 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2017-04-21 12:12:22 -0400 |
| commit | 69d5ad068b4ddf96c1497712ee8e7cdfe1d765df (patch) | |
| tree | 5c387295b304322fe3d5a3a6ea702ece2d9b0ca8 | |
| parent | cfff183f9ebcbe8ec4df9dcf39e95ac077d6e312 (diff) | |
| download | haskell-69d5ad068b4ddf96c1497712ee8e7cdfe1d765df.tar.gz | |
catch the case where there is no symCmd
We do check for symCmd, to set the info->nlist value, but forgot to do
the same check for info->names. Thus when trying to extract stroff from
symCmd, we hit a segfault.
Test Plan: The validation failure on windows is rather suspicious...
let's try this one
Reviewers: bgamari, adinapoli, austin, erikd, simonmar
Reviewed By: adinapoli
Subscribers: thomie, rwbarton
Differential Revision: https://phabricator.haskell.org/D3468
| -rw-r--r-- | rts/Linker.c | 2 | ||||
| -rw-r--r-- | rts/linker/MachO.c | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/rts/Linker.c b/rts/Linker.c index 7366904831..b214e9c01f 100644 --- a/rts/Linker.c +++ b/rts/Linker.c @@ -1215,6 +1215,8 @@ mkOc( pathchar *path, char *image, int imageSize, IF_DEBUG(linker, debugBelch("mkOc: start\n")); oc = stgMallocBytes(sizeof(ObjectCode), "mkOc(oc)"); + oc->info = NULL; + # if defined(OBJFORMAT_ELF) oc->formatName = "ELF"; # elif defined(OBJFORMAT_PEi386) diff --git a/rts/linker/MachO.c b/rts/linker/MachO.c index 16b712a804..e09d151c14 100644 --- a/rts/linker/MachO.c +++ b/rts/linker/MachO.c @@ -130,7 +130,9 @@ ocInit_MachO(ObjectCode * oc) oc->info->nlist = oc->info->symCmd == NULL ? NULL : (MachONList *)(oc->image + oc->info->symCmd->symoff); - oc->info->names = oc->image + oc->info->symCmd->stroff; + oc->info->names = oc->info->symCmd == NULL + ? NULL + : (oc->image + oc->info->symCmd->stroff); /* If we have symbols, allocate and fill the macho_symbols * This will make relocation easier. |