osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

From Evan Huus: Fix memory leaks in wslua_proto.c 

svn path=/trunk/; revision=42280
This commit is contained in:
Anders Broman 2012-04-27 05:51:47 +00:00
parent ace0603d8f
commit 48fc51f835
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
epan/wslua/wslua_proto.c
View File

@ -663,7 +663,7 @@ WSLUA_CONSTRUCTOR ProtoField_new(lua_State* L) { /* Creates a new field to be us
}
static int ProtoField_integer(lua_State* L, enum ftenum type) {
ProtoField f = g_malloc(sizeof(wslua_field_t));
ProtoField f;
const gchar* abbr = luaL_checkstring(L,1);
const gchar* name = luaL_optstring(L,2,abbr);
base_display_e base = luaL_optint(L, 3, BASE_DEC);
@ -694,6 +694,8 @@ static int ProtoField_integer(lua_State* L, enum ftenum type) {
return 0;
}
f = g_new((wslua_field_t,1);
f->hfid = -2;
f->ett = -1;
f->name = g_strdup(name);
@ -826,7 +828,7 @@ PROTOFIELD_INTEGER(int64,FT_INT64)
PROTOFIELD_INTEGER(framenum,FT_FRAMENUM)
static int ProtoField_boolean(lua_State* L, enum ftenum type) {
ProtoField f = g_malloc(sizeof(wslua_field_t));
ProtoField f;
const gchar* abbr = luaL_checkstring(L,1);
const gchar* name = luaL_optstring(L,2,abbr);
base_display_e base = luaL_optint(L, 3, BASE_NONE);
@ -851,6 +853,8 @@ static int ProtoField_boolean(lua_State* L, enum ftenum type) {
return 0;
}
f = g_new((wslua_field_t,1);
f->hfid = -2;
f->ett = -1;
f->name = g_strdup(name);
@ -884,7 +888,7 @@ static int ProtoField_boolean(lua_State* L, enum ftenum type) {
PROTOFIELD_BOOL(bool,FT_BOOLEAN)
static int ProtoField_time(lua_State* L,enum ftenum type) {
ProtoField f = g_malloc(sizeof(wslua_field_t));
ProtoField f;
const gchar* abbr = luaL_checkstring(L,1);
const gchar* name = luaL_optstring(L,2,abbr);
absolute_time_display_e base = luaL_optint(L,3,ABSOLUTE_TIME_LOCAL);
@ -902,6 +906,8 @@ static int ProtoField_time(lua_State* L,enum ftenum type) {
}
}
f = g_new((wslua_field_t,1);
f->hfid = -2;
f->ett = -1;
f->name = g_strdup(name);
@ -939,7 +945,7 @@ static int ProtoField_time(lua_State* L,enum ftenum type) {
PROTOFIELD_TIME(absolute_time,FT_ABSOLUTE_TIME)
static int ProtoField_other(lua_State* L,enum ftenum type) {
ProtoField f = g_malloc(sizeof(wslua_field_t));
ProtoField f;
const gchar* abbr = luaL_checkstring(L,1);
const gchar* name = luaL_optstring(L,2,abbr);
const gchar* blob = luaL_optstring(L,3,NULL);
@ -949,6 +955,8 @@ static int ProtoField_other(lua_State* L,enum ftenum type) {
return 0;
}
f = g_new((wslua_field_t,1);
f->hfid = -2;
f->ett = -1;
f->name = g_strdup(name);