minecraft-pi-reborn
/
minecraft-pi-reborn
7
11
Fork 13
Code Issues 4 Pull Requests 1 Actions Releases 3 Activity

Fix load_symbol ignoring source when a previous source has already been loaded #83

Merged
TheBrokenRail merged 2 commits from bigjango13/minecraft-pi-reborn:sounds into master 2024-02-07 02:16:35 +00:00
Conversation 0 Commits 2 Files Changed 1 +5 -3
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
media-layer/core/src/audio/file.cpp
View File

@ -13,10 +13,12 @@
// Load Symbol From ELF File
static void load_symbol(const char *source, const char *name, std::function<void(const unsigned char *, uint32_t)> callback) {
static std::unique_ptr<LIEF::ELF::Binary> binary = NULL;
if (binary == NULL) {
binary = LIEF::ELF::Parser::parse(source);
static std::unordered_map<std::string, std::unique_ptr<LIEF::ELF::Binary>> sources = {};
std::string cpp_source = source;
if (sources.count(cpp_source) == 0) {
bigjango13 marked this conversation as resolved Outdated
TheBrokenRail commented 2024-02-07 00:06:47 +00:00
Outdated
Review
Copy Link

Why not do?

static std::unordered_map<std::string, std::unique_ptr<LIEF::ELF::Binary>> sources = {};
std::string cpp_source = source;
if (sources.count(cpp_source) == 0) {
    sources[cpp_source] = LIEF::ELF::Parser::parse(source);
}
std::unique_ptr<LIEF::ELF::Binary> &binary = sources[cpp_source];
Why not do? ```c++ static std::unordered_map<std::string, std::unique_ptr<LIEF::ELF::Binary>> sources = {}; std::string cpp_source = source; if (sources.count(cpp_source) == 0) { sources[cpp_source] = LIEF::ELF::Parser::parse(source); } std::unique_ptr<LIEF::ELF::Binary> &binary = sources[cpp_source]; ```
bigjango13 commented 2024-02-07 01:18:11 +00:00
Outdated
Review
Copy Link

I didn't know about .count until now. Should I change it to that?

I didn't know about `.count` until now. Should I change it to that?
TheBrokenRail commented 2024-02-07 01:26:37 +00:00
Outdated
Review
Copy Link

Yeah, it's what the rest of Reborn uses.

Is it actually better? 🤷

But consistency is good.

Yeah, it's what the rest of Reborn uses. Is it actually better? 🤷 But consistency is good.
bigjango13 commented 2024-02-07 01:43:15 +00:00
Outdated
Review
Copy Link

Done 👍

Done :+1:
sources[cpp_source] = LIEF::ELF::Parser::parse(source);
}
std::unique_ptr<LIEF::ELF::Binary> &binary = sources[cpp_source];
const LIEF::ELF::Symbol *symbol = binary->get_dynamic_symbol(name);
if (symbol != NULL) {
LIEF::span<const uint8_t> data = binary->get_content_from_virtual_address(symbol->value(), symbol->size(), LIEF::Binary::VA_TYPES::VA);