Revert "Use make_unique_for_overwrite instead of malloc/free"

Jackarain · Jackarain · commit 7b17bac0670a · 2025-12-21T22:29:10.000+08:00
This reverts commit c7477e1.
diff --git a/proxy/include/proxy/fileop.hpp b/proxy/include/proxy/fileop.hpp
@@ -137,7 +137,7 @@ namespace fileop {
 			}
 
 			const auto buf_size = 1024 * 1024 * 4;
-			auto bufs = std::make_unique_for_overwrite<char[]>(buf_size);
+			std::unique_ptr<char, decltype(&std::free)> bufs((char*)std::malloc(buf_size), &std::free);
 
 			while (file.read(bufs.get(),buf_size) || file.gcount() > 0)
 			{
diff --git a/proxy/include/proxy/logging.hpp b/proxy/include/proxy/logging.hpp
@@ -269,7 +269,7 @@ namespace xlogging_compress__ {
 		using gzFileType = typename std::remove_pointer<gzFile>::type;
 		std::unique_ptr<gzFileType, closegz_deleter> gz_closer(out);
 
-		auto bufs = std::make_unique_for_overwrite<char[]>(LOGGING_GZ_BUFLEN);
+		std::unique_ptr<char, decltype(&std::free)> bufs((char*)std::malloc(LOGGING_GZ_BUFLEN), &std::free);
 		char* buf = bufs.get();
 		int len;
 
diff --git a/proxy/include/proxy/proxy_server.hpp b/proxy/include/proxy/proxy_server.hpp
@@ -3091,8 +3091,8 @@ R"x*x*x(<html>
 
 			constexpr auto buf_size = 512 * 1024;
 
-			auto buf0 = std::make_unique_for_overwrite<char[]>(buf_size);
-			auto buf1 = std::make_unique_for_overwrite<char[]>(buf_size);
+			std::unique_ptr<char, decltype(&std::free)> buf0((char*)std::malloc(buf_size), &std::free);
+			std::unique_ptr<char, decltype(&std::free)> buf1((char*)std::malloc(buf_size), &std::free);
 
 			// 分别使用主从缓冲指针用于并发读写.
 			auto primary_buf = buf0.get();
@@ -4284,7 +4284,7 @@ R"x*x*x(<html>
 			if (m_option.tcp_rate_limit_ > 0 && m_option.tcp_rate_limit_ < buf_size)
 				buf_size = m_option.tcp_rate_limit_;
 
-			auto bufs = std::make_unique_for_overwrite<char[]>(buf_size);
+			std::unique_ptr<char, decltype(&std::free)> bufs((char*)std::malloc(buf_size), &std::free);
 			char* buf = bufs.get();
 
 			std::streamsize total = 0;

Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ namespace fileop {`
`137`	`137`	`}`
`138`	`138`
`139`	`139`	`const auto buf_size = 1024 * 1024 * 4;`
`140`		`- auto bufs = std::make_unique_for_overwrite<char[]>(buf_size);`
	`140`	`+ std::unique_ptr<char, decltype(&std::free)> bufs((char*)std::malloc(buf_size), &std::free);`
`141`	`141`
`142`	`142`	`while (file.read(bufs.get(),buf_size) \|\| file.gcount() > 0)`
`143`	`143`	`{`