From 9119091a714b37bcb07d076f15bf9e347bfd5bf7 Mon Sep 17 00:00:00 2001 From: Rene Gollent Date: Thu, 2 Dec 2010 16:09:12 +0000 Subject: [PATCH] Cleanup. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@39704 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/apps/debugger/dwarf/DwarfFile.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/apps/debugger/dwarf/DwarfFile.cpp b/src/apps/debugger/dwarf/DwarfFile.cpp index 519424c879..54204d11a1 100644 --- a/src/apps/debugger/dwarf/DwarfFile.cpp +++ b/src/apps/debugger/dwarf/DwarfFile.cpp @@ -619,8 +619,8 @@ DwarfFile::UnwindCallFrame(CompilationUnit* unit, if (location >= initialLocation && location < initialLocation + addressRange) { // This is the FDE we're looking for. - off_t remaining = (off_t)length - - (dataReader.Offset() - lengthOffset); + off_t remaining = lengthOffset + length + - dataReader.Offset(); if (remaining < 0) return B_BAD_DATA; @@ -666,14 +666,16 @@ DwarfFile::UnwindCallFrame(CompilationUnit* unit, // read the FDE augmentation data (if any) FDEAugmentation fdeAugmentation; - off_t fdeOffset = dataReader.Offset(); error = cieAugmentation.ReadFDEData(dataReader, fdeAugmentation); if (error != B_OK) { TRACE_CFI(" failed to read FDE augmentation data!\n"); return error; } - remaining -= dataReader.Offset() - fdeOffset; + // adjust remaining byte count to take augmentation bytes + // (if any) into account. + remaining = lengthOffset + length + - dataReader.Offset(); error = context.SaveInitialRuleSet(); if (error != B_OK)