[svn] commit: r1209 - in /branches/jinmei-asio/src/lib/cc: ./ session.cc

[BIND 10 source code commits]

Author: jinmei
Date: Mon Mar  8 18:15:45 2010
New Revision: 1209

Log:
sync with trunk

Modified:
    branches/jinmei-asio/src/lib/cc/   (props changed)
    branches/jinmei-asio/src/lib/cc/session.cc

Modified: branches/jinmei-asio/src/lib/cc/session.cc
==============================================================================
--- branches/jinmei-asio/src/lib/cc/session.cc (original)
+++ branches/jinmei-asio/src/lib/cc/session.cc Mon Mar  8 18:15:45 2010
@@ -157,17 +157,17 @@
     if (header_length != length) {
         throw SessionError("Received non-empty body where only a header expected");
     }
-    
-    char *buffer = new char[length];
-    ret = read(sock, buffer, length);
-    if (ret != length)
-        throw SessionError("Short read");
-
-    std::string wire = std::string(buffer, length);
-    delete [] buffer;
+
+    std::vector<char> buffer(length);
+    ret = read(sock, &buffer[0], length);
+    if (ret != length) {
+        throw SessionError("Short read");
+    }
+
+    std::string wire = std::string(&buffer[0], length);
 
     std::stringstream wire_stream;
-    wire_stream <<wire;
+    wire_stream << wire;
 
     msg = Element::fromWire(wire_stream, length);