From ec3901b9045390cc3fe2bbc3a4d6f6cbdf606777 Mon Sep 17 00:00:00 2001
From: rexy712 <rexerton.rexy@tutamail.com>
Date: Thu, 9 Apr 2020 13:16:08 -0700
Subject: [PATCH] Update to newer librexy string construction

---
 include/raii/rjp_string.hpp | 2 +-
 src/matrix/roomcxn.cpp      | 2 +-
 src/raii/curler.cpp         | 6 +++---
 src/raii/util.cpp           | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/raii/rjp_string.hpp b/include/raii/rjp_string.hpp
index 4079657..99b1d8e 100644
--- a/include/raii/rjp_string.hpp
+++ b/include/raii/rjp_string.hpp
@@ -48,7 +48,7 @@ namespace raii{
 
 		using rexy::string_intermediary<detail::rjp_allocator>::string_intermediary;
 		rjp_string(RJP_value* r):
-			rexy::string_intermediary<detail::rjp_allocator>(r ? rjp_get_string(r)->value : nullptr,
+			rexy::string_intermediary<detail::rjp_allocator>(rexy::steal(r ? rjp_get_string(r)->value : nullptr),
 			                                           r ? rjp_get_string(r)->length : 0,
 			                                           r ? rjp_get_string(r)->length : 0)
 		{
diff --git a/src/matrix/roomcxn.cpp b/src/matrix/roomcxn.cpp
index cdf8da4..82654fc 100644
--- a/src/matrix/roomcxn.cpp
+++ b/src/matrix/roomcxn.cpp
@@ -64,7 +64,7 @@ namespace matrix{
 
 		raii::rjp_object_iterator it(res);
 		for(raii::rjp_object_iterator it = res;*it;++it){
-			raii::rjp_string tmp(rjp_member_key(*it)->value, rjp_member_key(*it)->length);
+			raii::rjp_string tmp(rexy::steal(rjp_member_key(*it)->value), rjp_member_key(*it)->length);
 			retval.value().emplace_back(std::move(tmp));
 		}
 		return retval;
diff --git a/src/raii/curler.cpp b/src/raii/curler.cpp
index fe0ce9b..74ee782 100644
--- a/src/raii/curler.cpp
+++ b/src/raii/curler.cpp
@@ -115,14 +115,14 @@ namespace raii{
 	curl_string curler::encode(const char* data, int len){
 		char* tmp = curl_easy_escape(m_curl, data, len);
 		size_t esclen = strlen(tmp);
-		return curl_string(tmp, esclen, esclen);
+		return curl_string(rexy::steal(tmp), esclen, esclen);
 	}
 	curl_string curler::decode(const char* data, int* outlen, int len){
 		if(outlen)
-			return curl_string(curl_easy_unescape(m_curl, data, len, outlen), *outlen);
+			return curl_string(rexy::steal(curl_easy_unescape(m_curl, data, len, outlen)), *outlen);
 		int out;
 		char* tmp = curl_easy_unescape(m_curl, data, len, &out);
-		return curl_string(tmp, out);
+		return curl_string(rexy::steal(tmp), out);
 	}
 
 	long curler::last_status(void)const{
diff --git a/src/raii/util.cpp b/src/raii/util.cpp
index 5ba05fb..ffc08a8 100644
--- a/src/raii/util.cpp
+++ b/src/raii/util.cpp
@@ -87,7 +87,7 @@ namespace raii{
 		char* tmp = reinterpret_cast<char*>(rexy::string::allocator_type::allocate(len+1));
 		detail::_sanitize_json_copy(tmp, str);
 		tmp[len] = 0;
-		return rexy::string(tmp, len, len);
+		return rexy::string(rexy::steal(tmp), len, len);
 	}