fix: robust macOS main-thread detection in TorManager and ByteArray memory safety

Author: jolavillette

src/tor/TorManager.cpp

@@ -154,11 +154,15 @@ std::string TorManager::torDataDirectory() const
 
 void TorManager::setTorDataDirectory(const std::string &path)
 {
-    assert(RsDirUtil::checkCreateDirectory(std::string(path)));
+    if(!RsDirUtil::checkCreateDirectory(path))
+    {
+        RsErr() << "TorManager::setTorDataDirectory() cannot create directory: " << path ;
+        return ;
+    }
 
     d->dataDir = path;
 
-    if (!d->dataDir.empty() && !ByteArray(d->dataDir).endsWith('/'))
+    if (!d->dataDir.empty() && !(d->dataDir.back() == '/'))
         d->dataDir += '/';
 }
 
@@ -937,10 +941,18 @@ void RsTor::setHiddenServiceDirectory(const std::string& dir)
     instance()->setHiddenServiceDirectory(dir);
 }
 
+#ifdef __APPLE__
+#include <pthread.h>
+#endif
+
 TorManager *RsTor::instance()
 {
+#ifdef __APPLE__
+    assert(pthread_main_np() != 0); // On macOS, ensure we are on the main thread
+#else
     static std::thread::id main_thread_id = std::this_thread::get_id();
     assert(std::this_thread::get_id() == main_thread_id); // make sure we're not in a different thread
+#endif
 
     if(rsTor == nullptr)
         rsTor = new TorManager;

src/tor/bytearray.h

@@ -53,13 +53,13 @@ class ByteArray: public std::vector<unsigned char>
 
         return res;
     }
-    bool endsWith(const ByteArray& b) const { return size() >= b.size() && (b.empty() || !memcmp(&data()[size()-b.size()],b.data(),b.size())); }
+    bool endsWith(const ByteArray& b) const { return size() >= b.size() && (b.empty() || !memcmp(data() + (size() - b.size()), b.data(), b.size())); }
     bool endsWith(char b) const { return size() > 0 && back()==b; }
-    bool startsWith(const ByteArray& b) const { return b.size() <= size() && (b.empty() || !strncmp((char*)b.data(),(char*)data(),std::min(size(),b.size()))); }
+    bool startsWith(const ByteArray& b) const { return size() >= b.size() && (b.empty() || !memcmp(data(), b.data(), b.size())); }
     bool startsWith(const char *b) const
     {
         for(uint32_t n=0;b[n]!=0;++n)
-            if(n >= size() || b[n]!=(*this)[n])
+            if(n >= size() || (unsigned char)b[n]!=(*this)[n])
                 return false;
 
         return true;
@@ -69,16 +69,19 @@ class ByteArray: public std::vector<unsigned char>
     {
         uint32_t n;
         for(n=0;b[n]!=0;++n)
-            if(n >= size() || b[n]!=(*this)[n])
+            if(n >= size() || (unsigned char)b[n]!=(*this)[n])
                 return false;
 
         return n==size();
     }
 
-    ByteArray mid(uint32_t n,int s=-1) const
+    ByteArray mid(uint32_t n, int s = -1) const
     {
-        ByteArray res((s>=0)?s:(size()-n));
-        if (!res.empty() && n < size()) memcpy(res.data(),&data()[n],res.size());
+        if (n >= size()) return ByteArray();
+        uint32_t max_len = (uint32_t)size() - n;
+        uint32_t len = (s >= 0) ? std::min((uint32_t)s, max_len) : max_len;
+        ByteArray res(len);
+        if (len > 0) memcpy(res.data(), data() + n, len);
         return res;
     }