From e8f463ef7a9cddda3813d20935957708d3b4aa3b Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Fri, 2 Mar 2012 14:54:24 -0500
Subject: [PATCH] Use LLProcess::ReadPipe::read() in LLLeap. The code was using
LLProcess::ReadPipe::get_istream().read(), but that's much uglier, as it
requires constructing a char* buffer etc. etc.
---
indra/llcommon/llleap.cpp | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/indra/llcommon/llleap.cpp b/indra/llcommon/llleap.cpp
index dddf1286ac8..beb7fa8333c 100644
--- a/indra/llcommon/llleap.cpp
+++ b/indra/llcommon/llleap.cpp
@@ -230,10 +230,7 @@ class LLLeapImpl: public LLLeap
// childout (well, up to a max length) to log what was wrong.
LLProcess::ReadPipe::size_type
readlen((std::min)(childout.size(), LLProcess::ReadPipe::size_type(80)));
- std::vector<char> buffer(readlen + 1);
- childstream.read(&buffer[0], readlen);
- buffer[childstream.gcount()] = '\0';
- bad_protocol(STRINGIZE(expect << char(colon) << &buffer[0]));
+ bad_protocol(STRINGIZE(expect << char(colon) << childout.read(readlen)));
}
else
{
--
GitLab