From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Fri, 13 Apr 2018 10:03:26 +0000 (+0200)
Subject: ixfrdist: don't use variable length array
X-Git-Tag: dnsdist-1.3.1~148^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=75d837d5d79452bdfdf309f1d638194add029805;p=thirdparty%2Fpdns.git

ixfrdist: don't use variable length array
---

diff --git a/pdns/ixfrdist.cc b/pdns/ixfrdist.cc
index e9e7c2f910..1521709737 100644
--- a/pdns/ixfrdist.cc
+++ b/pdns/ixfrdist.cc
@@ -932,9 +932,9 @@ int main(int argc, char** argv) {
   g_log<<Logger::Notice<<"IXFR distributor starting up!"<<endl;
 
   std::thread ut(updateThread);
-  std::thread tcpHandlers[g_vm["tcp-out-threads"].as<uint16_t>()];
-  for (int i=0; i<g_vm["tcp-out-threads"].as<uint16_t>(); i++) {
-    tcpHandlers[i] = std::thread(tcpWorker, i);
+  vector<std::thread> tcpHandlers;
+  for (int i = 0; i < g_vm["tcp-out-threads"].as<uint16_t>(); ++i) {
+    tcpHandlers.push_back(std::thread(tcpWorker, i));
   }
 
   struct timeval now;
@@ -955,8 +955,8 @@ int main(int argc, char** argv) {
   }
   g_tcpHandlerCV.notify_all();
   ut.join();
-  for (int i=0; i<g_vm["tcp-out-threads"].as<uint16_t>(); i++) {
-    tcpHandlers[i].join();
+  for (auto &t : tcpHandlers) {
+    t.join();
   }
   g_log<<Logger::Notice<<"IXFR distributor stopped"<<endl;
   return EXIT_SUCCESS;