Merge pull request #401 from unphased/too-much-solib-data-read-fix-#317

For #317
SimonKagstrom · Aug 5, 2023 · 93970b2 · 93970b2
2 parents a013c1c + a527605
commit 93970b2
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/solib-handler.cc b/src/solib-handler.cc
@@ -139,7 +139,8 @@ class SolibHandler : public ISolibHandler, ICollector::IEventTickListener
 
 	void solibThreadParse()
 	{
-		uint8_t buf[1024 * 1024];
+                auto buf_ = std::vector<uint8_t>(1024 * 1024 * 100);
+		uint8_t* buf = buf_.data();
 
 		m_solibFd = ::open(m_solibPath.c_str(), O_RDONLY);
 		m_solibThreadValid = true;
@@ -149,13 +150,13 @@ class SolibHandler : public ISolibHandler, ICollector::IEventTickListener
 
 		while (1)
 		{
-			int r = read(m_solibFd, buf, sizeof(buf));
+			int r = read(m_solibFd, buf, buf_.size());
 
 			// The destructor will close m_solibFd, so we'll exit here in that case
 			if (r <= 0)
 				break;
 
-			panic_if((unsigned )r >= sizeof(buf), "Too much solib data read");
+			panic_if((unsigned )r >= buf_.size(), "Too much solib data read");
 
 			struct phdr_data *p = phdr_data_unmarshal(buf);