From 5aa0f875d8806918a1790fd76c7a03e87a70e3a8 Mon Sep 17 00:00:00 2001
From: Jason Volk <jason@zemos.net>
Date: Sat, 23 May 2020 01:49:07 -0700
Subject: [PATCH] ircd::m::fed: Always move result to front of caller buffer.

---
 matrix/fed.cc | 30 ++++++++++++++++++++++++------
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/matrix/fed.cc b/matrix/fed.cc
index 05f16dbc6..b86e17f29 100644
--- a/matrix/fed.cc
+++ b/matrix/fed.cc
@@ -1847,7 +1847,10 @@ catch(const std::exception &e)
 		e.what(),
 	};
 
-	return origin;
+	return string_view
+	{
+		data(buf), move(buf, origin)
+	};
 }
 
 namespace ircd::m::fed
@@ -1894,7 +1897,10 @@ try
 
 		// Successful error; bail
 		if(code >= 400)
-			return origin;
+			return string_view
+			{
+				data(user_buf), move(user_buf, origin)
+			};
 
 		// Successful result; response content handled after loop.
 		if(code < 300)
@@ -1905,7 +1911,10 @@ try
 
 		// Indirection code, but no location response header
 		if(!location)
-			return origin;
+			return string_view
+			{
+				data(user_buf), move(user_buf, origin)
+			};
 
 		// Redirection; carry over the new target by copying it because it's
 		// in the buffer which we'll be overwriting for the new request.
@@ -1914,7 +1923,10 @@ try
 
 		// Indirection code, bad location header.
 		if(!uri.path || !uri.remote)
-			return origin;
+			return string_view
+			{
+				data(user_buf), move(user_buf, origin)
+			};
 	}
 
 	const json::string &m_server
@@ -1923,7 +1935,10 @@ try
 	};
 
 	if(!m_server)
-		return origin;
+		return string_view
+		{
+			data(user_buf), move(user_buf, origin)
+		};
 
 	// This construction validates we didn't get a junk string
 	volatile const net::hostport ret
@@ -1959,7 +1974,10 @@ catch(const std::exception &e)
 		e.what(),
 	};
 
-	return origin;
+	return string_view
+	{
+		data(user_buf), move(user_buf, origin)
+	};
 }
 
 /// Return a tuple of the HTTP code, any Location header, and the response