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 a64112755b253ec92ba5ec67624113aa41282b64..2a7460f72bfdb990cbebabbe8ca54cdb9d4dcfda 100644 (file)
--- 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) {