From 7c3609b04eabc79db0c0b245a155fc3c5e875053 Mon Sep 17 00:00:00 2001 From: chai Date: Sat, 8 Sep 2018 14:52:17 +0800 Subject: *update --- src/lua/modules/net/Buffer.cpp | 10 ++++++---- src/lua/modules/net/Buffer.h | 3 ++- 2 files changed, 8 insertions(+), 5 deletions(-) (limited to 'src/lua/modules/net') diff --git a/src/lua/modules/net/Buffer.cpp b/src/lua/modules/net/Buffer.cpp index cc9f2b4..1a62c9a 100644 --- a/src/lua/modules/net/Buffer.cpp +++ b/src/lua/modules/net/Buffer.cpp @@ -68,10 +68,12 @@ namespace net { BufferRef ref = checkNetBuffer(L); int offset = luax_checkinteger(L, 2); - int len; - const char* str = ref->grabString(&len, offset); - luax_pushstring(L, str); - luax_pushinteger(L, len); + unsigned int len; + char* data = ref->grabString(&len, offset); + Array str; + str.bind(data, len); + luax_pushstring(L, &str); + luax_pushinteger(L, str.count()); return 2; } diff --git a/src/lua/modules/net/Buffer.h b/src/lua/modules/net/Buffer.h index 31e6df8..172682d 100644 --- a/src/lua/modules/net/Buffer.h +++ b/src/lua/modules/net/Buffer.h @@ -52,7 +52,8 @@ namespace net return; } - const char* grabString(int* length, int offset = 0) + /* grab and create a string */ + char* grabString(unsigned int* length, int offset = 0) { int l = offset; for (; l < size; ++l) -- cgit v1.1-26-g67d0