diff --git a/contrib/libcxxrt/typeinfo.cc b/contrib/libcxxrt/typeinfo.cc
index 71de9ae59bd8..5c44ef1fd2ca 100644
--- a/contrib/libcxxrt/typeinfo.cc
+++ b/contrib/libcxxrt/typeinfo.cc
@@ -86,15 +86,7 @@ extern "C" char* __cxa_demangle(const char* mangled_name,
 	if (NULL != demangled)
 	{
 		size_t len = strlen(demangled);
-		if (buf == NULL)
-		{
-			if (n)
-			{
-				*n = len;
-			}
-			return demangled;
-		}
-		if (*n < len+1)
+		if (!buf || (*n < len+1))
 		{
 			buf = static_cast<char*>(realloc(buf, len+1));
 		}