From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Tue, 15 Nov 2016 15:37:53 +0000 (+0100)
Subject: calidns: Don't crash if we don't have enough 'unknown' queries remaining
X-Git-Tag: auth-4.0.2~7^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b9a440e595c4acd86e499c9a5941ae812cfc7a8c;p=thirdparty%2Fpdns.git

calidns: Don't crash if we don't have enough 'unknown' queries remaining

(cherry picked from commit b4f5799bf3ed50dc0146a2bbfb2c61551de0136b)
---

diff --git a/pdns/calidns.cc b/pdns/calidns.cc
index a64112755b..2a7460f72b 100644
--- a/pdns/calidns.cc
+++ b/pdns/calidns.cc
@@ -240,8 +240,15 @@ try
     cout<<"Aiming at "<<qps<< "qps for "<<seconds<<" seconds at cache hitrate "<<100.0*hitrate<<"%";
     unsigned int misses=(1-hitrate)*qps*seconds;
     unsigned int total=qps*seconds;
+    if (misses == 0) {
+      misses = 1;
+    }
     cout<<", need "<<misses<<" misses, "<<total<<" queries, have "<<unknown.size()<<" unknown left!"<<endl;
 
+    if (misses > unknown.size()) {
+      cerr<<"Not enough queries remaining (need at least "<<misses<<" and got "<<unknown.size()<<", please add more to the query file), exiting."<<endl;
+      exit(1);
+    }
     vector<vector<uint8_t>*> toSend;
     unsigned int n;
     for(n=0; n < misses; ++n) {