summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorB Stack <bgstack15@gmail.com>2020-02-18 09:45:06 -0500
committerB Stack <bgstack15@gmail.com>2020-02-18 09:45:06 -0500
commit959d94b8140cb1b4afb4932455135345d0218a65 (patch)
treebd7e735c4c8667c1d753b86d9ba838389e980700
parentfreefilesync 10.20 rpm rc1 (diff)
downloadstackrpms-959d94b8140cb1b4afb4932455135345d0218a65.tar.gz
stackrpms-959d94b8140cb1b4afb4932455135345d0218a65.tar.bz2
stackrpms-959d94b8140cb1b4afb4932455135345d0218a65.zip
fix el7/el8 fix for fuzz in no_eraseif
-rw-r--r--freefilesync/ffs_no_eraseif.patch8
1 files changed, 3 insertions, 5 deletions
diff --git a/freefilesync/ffs_no_eraseif.patch b/freefilesync/ffs_no_eraseif.patch
index d820cad..1df8ef5 100644
--- a/freefilesync/ffs_no_eraseif.patch
+++ b/freefilesync/ffs_no_eraseif.patch
@@ -257,7 +257,7 @@ diff -x '*.swp' -x .git -x '*.orig' -x '*.rej' -Naur 10.18-1/FreeFileSync/Source
diff -x '*.swp' -x .git -x '*.orig' -x '*.rej' -Naur 10.18-1/FreeFileSync/Source/ui/folder_history_box.h 10.18-2/FreeFileSync/Source/ui/folder_history_box.h
--- 10.18-1/FreeFileSync/Source/ui/folder_history_box.h 2019-11-20 16:15:55.849668360 -0500
+++ 10.18-2/FreeFileSync/Source/ui/folder_history_box.h 2019-11-20 17:57:30.562558429 -0500
-@@ -41,7 +41,7 @@
+@@ -35,13 +35,13 @@
const Zstring nameTmp = zen::trimCpy(folderPathPhrase);
//insert new folder or put it to the front if already existing
@@ -265,16 +265,14 @@ diff -x '*.swp' -x .git -x '*.orig' -x '*.rej' -Naur 10.18-1/FreeFileSync/Source
+ zen::eraseIf(folderPathPhrases_, [&](const Zstring& item) { return equalNoCase(item, nameTmp); });
folderPathPhrases_.insert(folderPathPhrases_.begin(), nameTmp);
-
-@@ -49,7 +49,7 @@
- folderPathPhrases_.resize(maxSize_);
+ truncate();
}
- void delItem(const Zstring& folderPathPhrase) { std::erase_if(folderPathPhrases_, [&](const Zstring& item) { return equalNoCase(item, folderPathPhrase); }); }
+ void delItem(const Zstring& folderPathPhrase) { zen::eraseIf(folderPathPhrases_, [&](const Zstring& item) { return equalNoCase(item, folderPathPhrase); }); }
private:
- size_t maxSize_ = 0;
+ void truncate()
diff -x '*.swp' -x .git -x '*.orig' -x '*.rej' -Naur 10.18-1/FreeFileSync/Source/ui/log_panel.cpp 10.18-2/FreeFileSync/Source/ui/log_panel.cpp
--- 10.18-1/FreeFileSync/Source/ui/log_panel.cpp 2019-11-20 16:15:55.852668394 -0500
+++ 10.18-2/FreeFileSync/Source/ui/log_panel.cpp 2019-11-20 17:57:30.562558429 -0500
bgstack15