From aab52eb9561966977dc158abdc99bb599ea1e989 Mon Sep 17 00:00:00 2001 From: dec05eba Date: Thu, 24 May 2018 03:47:07 +0200 Subject: Fix issues reported by compiler sanitizer --- depends/odhtdb | 2 +- src/Cache.cpp | 10 +++++----- src/main.cpp | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/depends/odhtdb b/depends/odhtdb index 2769920..0ce0eaf 160000 --- a/depends/odhtdb +++ b/depends/odhtdb @@ -1 +1 @@ -Subproject commit 27699207f857e06ac23707b55325565a2790e878 +Subproject commit 0ce0eaf93dea198a6b0f812c724be9bad74270b2 diff --git a/src/Cache.cpp b/src/Cache.cpp index 9039bd6..ae07f9d 100644 --- a/src/Cache.cpp +++ b/src/Cache.cpp @@ -103,7 +103,7 @@ namespace dchat fprintf(stderr, "Failed to read binds from file, reason: %s\n", e.what()); } - delete fileContent.data; + delete[] fileContent.data; } void Cache::replaceBindsInFile(const unordered_map &binds) @@ -311,15 +311,15 @@ namespace dchat checkContentAccessTimeThread.join(); } - static void replaceFileIgnoreError(const boost::filesystem::path &path) + static void createFileIgnoreError(const boost::filesystem::path &path) { try { - fileReplace(path, StringView()); + fileReplace(path, StringView("", 0)); } catch(FileException &e) { - fprintf(stderr, "Failed to replace file: %s, reason: %s\n", path.string().c_str(), e.what()); + fprintf(stderr, "Failed to create empty file: %s, reason: %s\n", path.string().c_str(), e.what()); } } @@ -363,7 +363,7 @@ namespace dchat return contentByUrlResult; } - replaceFileIgnoreError(downloadingFilepath); + createFileIgnoreError(downloadingFilepath); ContentByUrlResult result((sf::Texture*)nullptr, ContentByUrlResult::Type::DOWNLOADING); contentUrlCache[url] = result; diff --git a/src/main.cpp b/src/main.cpp index 8b8bddf..f83339f 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -947,7 +947,7 @@ int main(int argc, char **argv) for(Channel *channel : channels) { - channel->update(); + delete channel; } // We need to wait until our `ping` packet for disconnecting is sent to all channels -- cgit v1.2.3