From: Julian Andres Klode <jak@debian.org>
Date: Fri, 23 Oct 2015 18:31:12 +0000 (+0200)
Subject: GetSrvRecords: Make thread-safe
X-Git-Tag: 1.1_exp15~65
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/308d0cf53f4b7ad1750fb1efb42b908c8e336b9f

GetSrvRecords: Make thread-safe

Gbp-Dch: ignore
---

diff --git a/apt-pkg/contrib/srvrec.cc b/apt-pkg/contrib/srvrec.cc
index 837f2c84e..9af282653 100644
--- a/apt-pkg/contrib/srvrec.cc
+++ b/apt-pkg/contrib/srvrec.cc
@@ -28,8 +28,13 @@
 bool GetSrvRecords(std::string host, int port, std::vector<SrvRec> &Result)
 {
    std::string target;
-   struct servent *s_ent = getservbyport(htons(port), "tcp");
-   if (s_ent == NULL)
+   int res;
+   struct servent s_ent_buf;
+   struct servent *s_ent = nullptr;
+   std::vector<char> buf(1024);
+
+   res = getservbyport_r(htons(port), "tcp", &s_ent_buf, buf.data(), buf.size(), &s_ent);
+   if (res != 0 || s_ent == nullptr)
       return false;
 
    strprintf(target, "_%s._tcp.%s", s_ent->s_name, host.c_str());