debian package: add rclconfig patch

This commit is contained in:
Jean-Francois Dockes 2020-10-12 20:18:32 +02:00
parent c42fe8c105
commit ceecf5ff43
3 changed files with 28 additions and 1 deletions

View File

@ -1,4 +1,4 @@
recoll (1.27.9-1~ppaPPAVERS~SERIES1) SERIES; urgency=low
recoll (1.27.9-2~ppaPPAVERS~SERIES1) SERIES; urgency=low
* Fix bug in result table display.

View File

@ -0,0 +1,26 @@
diff --git a/common/rclconfig.cpp b/common/rclconfig.cpp
index 1d5afba5d..dbbdcb256 100644
--- a/common/rclconfig.cpp
+++ b/common/rclconfig.cpp
@@ -1689,13 +1689,20 @@ bool RclConfig::processFilterCmd(std::vector<std::string>& cmd) const
bool hasinterp = !stringlowercmp("python", *it) ||
!stringlowercmp("perl", *it);
- *it++ = findFilter(*it);
+ // Note that, if the cmd vector size is 1, post-incrementing the
+ // iterator in the following statement, which works on x86, leads
+ // to a crash on ARM with gcc 6 and 8 (at least), which does not
+ // seem right (it should just become cmd.end() ?) but
+ // whatever... We do it later then.
+ *it = findFilter(*it);
+
if (hasinterp) {
if (cmd.size() < 2) {
LOGERR("processFilterCmd: python/perl cmd: no script?. [" <<
stringsToString(cmd) << "]\n");
return false;
} else {
+ ++it;
*it = findFilter(*it);
}
}

View File

@ -0,0 +1 @@
rclconfig-avoid-post-increment-before-end.diff