From d23267469a1123d573b0a87fd868e58666b3b919 Mon Sep 17 00:00:00 2001 From: Kelvin Sherlock Date: Tue, 7 Feb 2017 22:19:19 -0500 Subject: [PATCH 1/2] fix for fixed-size labels (CAL). --- DumpOBJ.cc | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/DumpOBJ.cc b/DumpOBJ.cc index 50c6a87..3819f03 100644 --- a/DumpOBJ.cc +++ b/DumpOBJ.cc @@ -436,10 +436,15 @@ disp = nam_disp-sizeof(header); /* skip any extra stuff */ if (disp) for (i = 0; i < disp; ++i) fgetc(f); -for (i = 0; i < 10; ++i) /* read the load segment name */ - loadname[i] = fgetc(f); -loadname[10] = (char) 0; -len = fgetc(f); /* read the code segment name */ + +if (version == 0) loadname[0] = 0; +else { + for (i = 0; i < 10; ++i) /* read the load segment name */ + loadname[i] = fgetc(f); + loadname[10] = (char) 0; +} +len = lablen; +if (!len) len = fgetc(f); /* read the code segment name */ for (i = 0; i < len; ++i) segname[i] = fgetc(f); segname[len] = (char) 0; From 096d5b589cba31fc5c7745e56b348fe9ade25cf0 Mon Sep 17 00:00:00 2001 From: MikeW50 Date: Sun, 25 Mar 2018 15:27:58 -0600 Subject: [PATCH 2/2] Update DumpOBJ.cc --- DumpOBJ.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/DumpOBJ.cc b/DumpOBJ.cc index 3819f03..3f7b699 100644 --- a/DumpOBJ.cc +++ b/DumpOBJ.cc @@ -437,14 +437,16 @@ if (disp) for (i = 0; i < disp; ++i) fgetc(f); -if (version == 0) loadname[0] = 0; +if (version == 0) + loadname[0] = 0; else { for (i = 0; i < 10; ++i) /* read the load segment name */ loadname[i] = fgetc(f); loadname[10] = (char) 0; } len = lablen; -if (!len) len = fgetc(f); /* read the code segment name */ +if (!len) + len = fgetc(f); /* read the code segment name */ for (i = 0; i < len; ++i) segname[i] = fgetc(f); segname[len] = (char) 0;