From 31d7b648b4fc2a7f0a3770b83cd2991cbe63d64a Mon Sep 17 00:00:00 2001 From: Cloud Wu Date: Mon, 13 Oct 2014 17:55:54 +0800 Subject: [PATCH] bugfix: not padding 0 --- lualib-src/lua-socket.c | 2 +- skynet-src/skynet_socket.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/lualib-src/lua-socket.c b/lualib-src/lua-socket.c index 094c958f..81322d17 100644 --- a/lualib-src/lua-socket.c +++ b/lualib-src/lua-socket.c @@ -368,7 +368,7 @@ lunpack(lua_State *L) { lua_pushinteger(L, message->id); lua_pushinteger(L, message->ud); if (message->buffer == NULL) { - lua_pushlstring(L, (char *)(message+1),size - sizeof(*message) - 1); + lua_pushlstring(L, (char *)(message+1),size - sizeof(*message)); } else { lua_pushlightuserdata(L, message->buffer); } diff --git a/skynet-src/skynet_socket.c b/skynet-src/skynet_socket.c index 989f88e0..e9af5d26 100644 --- a/skynet-src/skynet_socket.c +++ b/skynet-src/skynet_socket.c @@ -36,10 +36,9 @@ forward_message(int type, bool padding, struct socket_message * result) { int sz = sizeof(*sm); if (padding) { if (result->data) { - sz += strlen(result->data) + 1; + sz += strlen(result->data); } else { result->data = ""; - sz += 1; } } sm = (struct skynet_socket_message *)skynet_malloc(sz);