mirror/ImHex
1
0
Fork 0
mirror of https://github.com/WerWolv/ImHex.git synced 2026-01-23 21:18:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix: Crashes when resizing file

Browse Source 
Fixes #721
This commit is contained in:
WerWolv
2022-09-04 11:16:20 +02:00
parent 45e987b413
commit d9a47fe815
13 changed files with 27 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/libimhex/include/hex/providers/provider.hpp
View File

@@ -70,8 +70,8 @@ namespace hex::prv {
[[nodiscard]] virtual std::string getName() const = 0;
[[nodiscard]] virtual std::vector<std::pair<std::string, std::string>> getDataInformation() const = 0;
[[nodiscard]] virtual bool open();
virtual void close();
[[nodiscard]] virtual bool open() = 0;
virtual void close() = 0;
void addPatch(u64 offset, const void *buffer, size_t size, bool createUndo = false);
void createUndoPoint();

2
lib/libimhex/source/api/imhex_api.cpp
View File

@@ -308,6 +308,8 @@ namespace hex {
setCurrentProvider(0);
provider->close();
EventManager::post<EventProviderClosed>(provider);
delete provider;
}

8
lib/libimhex/source/providers/provider.cpp
View File

@@ -170,14 +170,6 @@ namespace hex::prv {
return page;
}
bool Provider::open() {
EventManager::post<EventProviderOpened>(this);
return true;
}
void Provider::close() {
EventManager::post<EventProviderClosed>(this);
}
void Provider::addPatch(u64 offset, const void *buffer, size_t size, bool createUndo) {
if (this->m_patchTreeOffset > 0) {
auto iter = this->m_patches.end();

3
plugins/builtin/include/content/providers/null_provider.hpp
View File

@@ -15,6 +15,9 @@ namespace hex::plugin::builtin::prv {
[[nodiscard]] bool isResizable() const override { return false; }
[[nodiscard]] bool isSavable() const override { return false; }
[[nodiscard]] bool open() override { return true; }
void close() override { }
void readRaw(u64 offset, void *buffer, size_t size) override { hex::unused(offset, buffer, size); }
void writeRaw(u64 offset, const void *buffer, size_t size) override { hex::unused(offset, buffer, size); }
[[nodiscard]] size_t getActualSize() const override { return 0x00; }

8
plugins/builtin/source/content/events.cpp
View File

@@ -21,7 +21,8 @@ namespace hex::plugin::builtin {
auto provider = ImHexApi::Provider::createProvider("hex.builtin.provider.file", true);
if (auto *fileProvider = dynamic_cast<prv::FileProvider*>(provider); fileProvider != nullptr) {
fileProvider->setPath(path);
(void)fileProvider->open();
if (fileProvider->open())
EventManager::post<EventProviderOpened>(fileProvider);
}
}
@@ -100,6 +101,8 @@ namespace hex::plugin::builtin {
TaskManager::doLater([provider] { ImHexApi::Provider::remove(provider); });
return;
}
EventManager::post<EventProviderOpened>(provider);
}
else if (provider->hasLoadInterface())
EventManager::post<RequestOpenPopup>(View::toWindowName("hex.builtin.view.provider_settings.load_popup"));
@@ -107,7 +110,10 @@ namespace hex::plugin::builtin {
if (!provider->open() || !provider->isAvailable()) {
View::showErrorPopup("hex.builtin.popup.error.open"_lang);
TaskManager::doLater([provider] { ImHexApi::Provider::remove(provider); });
return;
}
EventManager::post<EventProviderOpened>(provider);
}
});

2
plugins/builtin/source/content/providers.cpp
View File

@@ -41,6 +41,8 @@ namespace hex::plugin::builtin {
provider->loadSettings(providerSettings["settings"]);
if (!provider->open())
success = false;
else
EventManager::post<EventProviderOpened>(provider);
}
return success;

4
plugins/builtin/source/content/providers/disk_provider.cpp
View File

@@ -137,7 +137,7 @@ namespace hex::plugin::builtin::prv {
#endif
return Provider::open();
return true;
}
void DiskProvider::close() {
@@ -156,8 +156,6 @@ namespace hex::plugin::builtin::prv {
this->m_diskHandle = -1;
#endif
Provider::close();
}
void DiskProvider::readRaw(u64 offset, void *buffer, size_t size) {

4
plugins/builtin/source/content/providers/file_provider.cpp
View File

@@ -300,7 +300,7 @@ namespace hex::plugin::builtin::prv {
#endif
return Provider::open();
return true;
}
void FileProvider::close() {
@@ -319,8 +319,6 @@ namespace hex::plugin::builtin::prv {
::close(this->m_file);
#endif
Provider::close();
}
void FileProvider::loadSettings(const nlohmann::json &settings) {

4
plugins/builtin/source/content/providers/gdb_provider.cpp
View File

@@ -273,7 +273,7 @@ namespace hex::plugin::builtin::prv {
}
});
return Provider::open();
return true;
} else {
return false;
}
@@ -285,8 +285,6 @@ namespace hex::plugin::builtin::prv {
if (this->m_cacheUpdateThread.joinable()) {
this->m_cacheUpdateThread.join();
}
Provider::close();
}
bool GDBProvider::isConnected() const {

3
plugins/builtin/source/content/providers/intel_hex_provider.cpp
View File

@@ -210,12 +210,11 @@ namespace hex::plugin::builtin::prv {
this->m_dataSize = maxAddress + 1;
this->m_dataValid = true;
return Provider::open();
return true;
}
void IntelHexProvider::close() {
Provider::close();
}
[[nodiscard]] std::string IntelHexProvider::getName() const {

4
plugins/builtin/source/content/providers/motorola_srec_provider.cpp
View File

@@ -190,11 +190,11 @@ namespace hex::plugin::builtin::prv {
this->m_dataSize = maxAddress + 1;
this->m_dataValid = true;
return Provider::open();
return true;
}
void MotorolaSRECProvider::close() {
Provider::close();
}
[[nodiscard]] std::string MotorolaSRECProvider::getName() const {

1
plugins/builtin/source/content/views/view_provider_settings.cpp
View File

@@ -36,6 +36,7 @@ namespace hex::plugin::builtin {
if (ImGui::Button("hex.builtin.common.open"_lang)) {
if (provider->open()) {
EventManager::post<EventProviderOpened>(provider);
ImGui::CloseCurrentPopup();
}
else {

5
plugins/builtin/source/content/welcome_screen.cpp
View File

@@ -99,6 +99,8 @@ namespace hex::plugin::builtin {
return;
}
EventManager::post<EventProviderOpened>(provider);
updateRecentProviders();
}
}
@@ -340,7 +342,8 @@ namespace hex::plugin::builtin {
if (ImGui::Hyperlink("X")) {
auto provider = ImHexApi::Provider::createProvider("hex.builtin.provider.null");
if (provider != nullptr)
(void)provider->open();
if (provider->open())
EventManager::post<EventProviderOpened>(provider);
}
}