report unparseable data in stoul invalid_argument exception

PowerDNS · Mar 26, 2018 · 9a0319b · 9a0319b
1 parent 6883b1d
commit 9a0319b
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/pdns/misc.cc b/pdns/misc.cc
@@ -1360,7 +1360,13 @@ gid_t strToGID(const string &str)
 unsigned int pdns_stou(const std::string& str, size_t * idx, int base)
 {
   if (str.empty()) return 0; // compatibility
-  unsigned long result = std::stoul(str, idx, base);
+  unsigned long result;
+  try {
+    result = std::stoul(str, idx, base);
+  }
+  catch(std::invalid_argument& e) {
+    throw std::invalid_argument(string(e.what()) + "; data was \""+str+"\"");
+  }
   if (result > std::numeric_limits<unsigned int>::max()) {
     throw std::out_of_range("stou");
   }