Don't skip the counting if fcount_incr() is called with force==true (v2)

The fcount_incr() was not increasing counter->count when force was set
to true, but fcount_decr() would try to decrease the counter leading to
underflow and assertion failure.  Swap the order of the arguments in the
condition, so the !force is evaluated after incrementing the .count.

(cherry picked from commit 8e86e55af19f70d056b3a8f651d75500534463f6)

diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index 78e0634aabca5be7fa4306a3bbe4385f1b018072..dd944f867094ccd1800a7299e2ccbafb7d6e6d0a 100644 (file)
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -1487,7 +1487,7 @@ fcount_incr(fetchctx_t *fctx, bool force) {
 
        INSIST(spill > 0);
        LOCK(&counter->lock);
-       if (!force && ++counter->count > spill) {
+       if (++counter->count > spill && !force) {
                counter->count--;
                INSIST(counter->count > 0);
                counter->dropped++;