.

diff --git a/backends/core-get-pc.c b/backends/core-get-pc.c
index 164876ca989da2e1b1a8ae440b6c378259ab747f..4d1b92e1f04b74b5232b85bbd3a11f4735ef3b33 100644 (file)
--- a/backends/core-get-pc.c
+++ b/backends/core-get-pc.c
@@ -62,7 +62,7 @@ core_get_pc (Elf *core, Dwarf_Addr *core_pc, unsigned pc_offset)
          {
            case 32:;
              uint32_t val32 = *(const uint32_t *) reg_desc;
-             reg_desc += sizeof (val32);
+             reg_desc += sizeof val32;
              val32 = (elf_getident (core, NULL)[EI_DATA] == ELFDATA2MSB
                       ? be32toh (val32) : le32toh (val32));
              /* Do a host width conversion.  */
@@ -70,7 +70,7 @@ core_get_pc (Elf *core, Dwarf_Addr *core_pc, unsigned pc_offset)
              break;
            case 64:;
              uint64_t val64 = *(const uint64_t *) reg_desc;
-             reg_desc += sizeof (val64);
+             reg_desc += sizeof val64;
              val64 = (elf_getident (core, NULL)[EI_DATA] == ELFDATA2MSB
                       ? be64toh (val64) : le64toh (val64));
              val = val64;

diff --git a/libdwfl/dwfl_frame_state.c b/libdwfl/dwfl_frame_state.c
index 1cc18f77077de3888bbd8e0f424eaf797e4487d4..fef8cb63810fa0b3cff323181eabcd35688d12ca 100644 (file)
--- a/libdwfl/dwfl_frame_state.c
+++ b/libdwfl/dwfl_frame_state.c
@@ -588,6 +588,7 @@ dwfl_frame_state_core (Dwfl *dwfl, const char *corefile)
                  {
                    case 32:;
                      uint32_t val32 = *(const uint32_t *) reg_desc;
+                     reg_desc += sizeof val32;
                      val32 = (elf_getident (core, NULL)[EI_DATA] == ELFDATA2MSB
                               ? be32toh (val32) : le32toh (val32));
                      /* Do a host width conversion.  */
@@ -595,9 +596,10 @@ dwfl_frame_state_core (Dwfl *dwfl, const char *corefile)
                      break;
                    case 64:;
                      uint64_t val64 = *(const uint64_t *) reg_desc;
+                     reg_desc += sizeof val64;
                      val64 = (elf_getident (core, NULL)[EI_DATA] == ELFDATA2MSB
                               ? be64toh (val64) : le64toh (val64));
-                     assert (sizeof (*state->regs) == sizeof (val64));
+                     assert (sizeof (*state->regs) == sizeof val64);
                      val = val64;
                      break;
                    default: