GeezerVison

The World Wide Web, restored to 800 pixels of glory.

GeezerVison is showing github.com — Extend rbran's parser robustness fixes with file-backed bounds and co… · Vector35/binaryninja-api@6acb6ec

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

binaryview.cpp
view/macho

Expand file treeCollapse file tree

Open diff view settings

Collapse file

`‎binaryview.cpp‎`

Copy file name to clipboardExpand all lines: binaryview.cpp

+44-7Lines changed: 44 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -1384,15 +1384,39 @@ BinaryView::BinaryView(BNBinaryView* view)`
`1384`	`1384`
`1385`	`1385`	`bool BinaryView::InitCallback(void* ctxt)`
`1386`	`1386`	`{`
`1387`		`- CallbackRef<BinaryView> view(ctxt);`
`1388`		`- return view->Init();`
	`1387`	`+ try`
	`1388`	`+ {`
	`1389`	`+ CallbackRef<BinaryView> view(ctxt);`
	`1390`	`+ return view->Init();`
	`1391`	`+ }`
	`1392`	`+ catch (const std::exception& e)`
	`1393`	`+ {`
	`1394`	`+ LogError("BinaryView::Init failed: %s", e.what());`
	`1395`	`+ return false;`
	`1396`	`+ }`
	`1397`	`+ catch (...)`
	`1398`	`+ {`
	`1399`	`+ LogError("BinaryView::Init failed with unknown exception");`
	`1400`	`+ return false;`
	`1401`	`+ }`
`1389`	`1402`	`}`
`1390`	`1403`
`1391`	`1404`
`1392`	`1405`	`void BinaryView::OnAfterSnapshotDataAppliedCallback(void* ctxt)`
`1393`	`1406`	`{`
`1394`		`- CallbackRef<BinaryView> view(ctxt);`
`1395`		`- view->OnAfterSnapshotDataApplied();`
	`1407`	`+ try`
	`1408`	`+ {`
	`1409`	`+ CallbackRef<BinaryView> view(ctxt);`
	`1410`	`+ view->OnAfterSnapshotDataApplied();`
	`1411`	`+ }`
	`1412`	`+ catch (const std::exception& e)`
	`1413`	`+ {`
	`1414`	`+ LogError("BinaryView::OnAfterSnapshotDataApplied failed: %s", e.what());`
	`1415`	`+ }`
	`1416`	`+ catch (...)`
	`1417`	`+ {`
	`1418`	`+ LogError("BinaryView::OnAfterSnapshotDataApplied failed with unknown exception");`
	`1419`	`+ }`
`1396`	`1420`	`}`
`1397`	`1421`
`1398`	`1422`
`@@ -1531,9 +1555,22 @@ size_t BinaryView::GetAddressSizeCallback(void* ctxt)`
`1531`	`1555`
`1532`	`1556`	`bool BinaryView::SaveCallback(void* ctxt, BNFileAccessor* file)`
`1533`	`1557`	`{`
`1534`		`- CallbackRef<BinaryView> view(ctxt);`
`1535`		`- CoreFileAccessor accessor(file);`
`1536`		`- return view->PerformSave(&accessor);`
	`1558`	`+ try`
	`1559`	`+ {`
	`1560`	`+ CallbackRef<BinaryView> view(ctxt);`
	`1561`	`+ CoreFileAccessor accessor(file);`
	`1562`	`+ return view->PerformSave(&accessor);`
	`1563`	`+ }`
	`1564`	`+ catch (const std::exception& e)`
	`1565`	`+ {`
	`1566`	`+ LogError("BinaryView::Save failed: %s", e.what());`
	`1567`	`+ return false;`
	`1568`	`+ }`
	`1569`	`+ catch (...)`
	`1570`	`+ {`
	`1571`	`+ LogError("BinaryView::Save failed with unknown exception");`
	`1572`	`+ return false;`
	`1573`	`+ }`
`1537`	`1574`	`}`
`1538`	`1575`
`1539`	`1576`

Collapse file

`‎view/macho/chained_fixups.cpp‎`

Copy file name to clipboardExpand all lines: view/macho/chained_fixups.cpp

+15-4Lines changed: 15 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -240,12 +240,21 @@ auto FixupReaderForFormat(int format) -> std::pair<uint64_t, FixupInfo>(*)(Binar`
`240`	`240`	`throw std::invalid_argument("Unknown chained pointer format: " + std::to_string(format));`
`241`	`241`	`}`
`242`	`242`
	`243`	+// Returns the NUL-terminated string starting at `offset` within `symbolData`, or an
	`244`	+// empty view if `offset` does not fall within `symbolData`.
	`245`	`+std::string_view SymbolNameAt(std::span<const char> symbolData, uint32_t offset)`
	`246`	`+{`
	`247`	`+ if (symbolData.size() <= offset)`
	`248`	`+ return std::string_view();`
	`249`	`+ return std::string_view(&symbolData[offset], strnlen(&symbolData[offset], symbolData.size() - offset));`
	`250`	`+}`
	`251`	`+`
`243`	`252`	`ImportEntry ReadChainedImport32(BinaryReader& reader, std::span<const char> symbolData)`
`244`	`253`	`{`
`245`	`254`	`dyld_chained_import import;`
`246`	`255`	`reader.Read(&import, sizeof(import));`
`247`	`256`	`return {`
`248`		`- std::string_view(&symbolData[import.name_offset]),`
	`257`	`+ SymbolNameAt(symbolData, import.name_offset),`
`249`	`258`	`0,`
`250`	`259`	`import.lib_ordinal > 0xF0 ? static_cast<int8_t>(import.lib_ordinal) : static_cast<int32_t>(import.lib_ordinal),`
`251`	`260`	`(bool)import.weak_import,`
`@@ -257,7 +266,7 @@ ImportEntry ReadChainedImportAddend32(BinaryReader& reader, std::span<const char`
`257`	`266`	`dyld_chained_import_addend import;`
`258`	`267`	`reader.Read(&import, sizeof(import));`
`259`	`268`	`return {`
`260`		`- std::string_view(&symbolData[import.name_offset]),`
	`269`	`+ SymbolNameAt(symbolData, import.name_offset),`
`261`	`270`	`static_cast<uint32_t>(import.addend),`
`262`	`271`	`import.lib_ordinal > 0xF0 ? static_cast<int8_t>(import.lib_ordinal) : static_cast<int32_t>(import.lib_ordinal),`
`263`	`272`	`(bool)import.weak_import,`
`@@ -269,7 +278,7 @@ ImportEntry ReadChainedImportAddend64(BinaryReader& reader, std::span<const char`
`269`	`278`	`dyld_chained_import_addend64 import;`
`270`	`279`	`reader.Read(&import, sizeof(import));`
`271`	`280`	`return {`
`272`		`- std::string_view(&symbolData[import.name_offset]),`
	`281`	`+ SymbolNameAt(symbolData, import.name_offset),`
`273`	`282`	`import.addend,`
`274`	`283`	`import.lib_ordinal > 0xFFF0 ? static_cast<int16_t>(import.lib_ordinal) : static_cast<int32_t>(import.lib_ordinal),`
`275`	`284`	`(bool)import.weak_import,`
`@@ -304,6 +313,8 @@ std::vector<ImportEntry> ChainedFixupProcessor::ProcessImports() const`
`304`	`313`
`305`	`314`	`auto header = ReadHeader(reader);`
`306`	`315`
	`316`	`+ if (header.symbols_offset >= m_fixupsSize)`
	`317`	`+ return imports;`
`307`	`318`	`uint64_t symbolDataSize = m_fixupsSize - header.symbols_offset;`
`308`	`319`	`m_symbolData.resize(symbolDataSize);`
`309`	`320`	`m_raw->Read(&m_symbolData[0], OffsetInFixups(header.symbols_offset), symbolDataSize);`
`@@ -435,7 +446,7 @@ void ChainedFixupProcessor::ProcessChainsInSegment(const dyld_chained_starts_in_`
`435`	`446`
`436`	`447`	`bool done = false;`
`437`	`448`	`while (!done)`
`438`		`- {`
	`449`	`+ {`
`439`	`450`	`uint64_t position = reader.GetOffset();`
`440`	`451`	`auto [raw, fixupInfo] = fixupReader(reader);`
`441`	`452`

0 commit comments

Comments

0 (0)

You are visitor 01402520 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.