dany/luasocket
1
0
Fork 0
mirror of https://github.com/lunarmodules/luasocket.git synced 2025-10-31 10:25:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix HORRIBLE but in b64/qp code.

Browse Source 
Bug was caught by user moteus.
Code was checking if arguments was nil after using
luaL_Buffer code, which messes with the stack.
Simple to fix, though.
This commit is contained in:
Diego Nehab
2012-08-01 03:06:09 -03:00
parent 54ffcd483f
commit f329aae724
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/makefile
View File

@@ -29,7 +29,7 @@ DEBUG?=NODEBUG
# LUAINC_macosx: # LUAINC_macosx:
# /opt/local/include # /opt/local/include
LUAINC_macosx_base?=/opt/local/include LUAINC_macosx_base?=/opt/local/include
LUAINC_macosx?=$(LUAINC_macosx_base)$(LUAV) LUAINC_macosx?=$(LUAINC_macosx_base)/lua$(LUAV)
# FIXME default should this default to fink or to macports? # FIXME default should this default to fink or to macports?
# What happens when more than one Lua version is installed? # What happens when more than one Lua version is installed?
LUAPREFIX_macosx?=/opt/local/ LUAPREFIX_macosx?=/opt/local/

8
src/mime.c
View File

@@ -263,6 +263,8 @@ static int mime_global_b64(lua_State *L)
lua_pushnil(L); lua_pushnil(L);
return 2; return 2;
} }
/* make sure we don't confuse buffer stuff with arguments */
lua_settop(L, 2);
/* process first part of the input */ /* process first part of the input */
luaL_buffinit(L, &buffer); luaL_buffinit(L, &buffer);
while (input < last) while (input < last)
@@ -307,6 +309,8 @@ static int mime_global_unb64(lua_State *L)
lua_pushnil(L); lua_pushnil(L);
return 2; return 2;
} }
/* make sure we don't confuse buffer stuff with arguments */
lua_settop(L, 2);
/* process first part of the input */ /* process first part of the input */
luaL_buffinit(L, &buffer); luaL_buffinit(L, &buffer);
while (input < last) while (input < last)
@@ -458,6 +462,8 @@ static int mime_global_qp(lua_State *L)
lua_pushnil(L); lua_pushnil(L);
return 2; return 2;
} }
/* make sure we don't confuse buffer stuff with arguments */
lua_settop(L, 3);
/* process first part of input */ /* process first part of input */
luaL_buffinit(L, &buffer); luaL_buffinit(L, &buffer);
while (input < last) while (input < last)
@@ -531,6 +537,8 @@ static int mime_global_unqp(lua_State *L)
lua_pushnil(L); lua_pushnil(L);
return 2; return 2;
} }
/* make sure we don't confuse buffer stuff with arguments */
lua_settop(L, 2);
/* process first part of input */ /* process first part of input */
luaL_buffinit(L, &buffer); luaL_buffinit(L, &buffer);
while (input < last) while (input < last)