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

From Robert G. Jakabosky via bug 5575: 

Fix memory errors in Lua dissectors.
- Free Tvb when created from ByteArray.
- Free TvbRange correctly.
- Free string from get_persconffile_path and get_datafile_path.
- Some code cleanup.

svn path=/trunk/; revision=39744
This commit is contained in:
Stig Bjørlykke 2011-11-06 17:39:13 +00:00
parent 54c1e0e2a6
commit 0352ac8e8f
6 changed files with 68 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
epan/wslua/init_wslua.c
View File

@ -53,6 +53,7 @@ dissector_handle_t lua_data_handle;
static void lua_frame_end(void)
{
clear_outstanding_Tvb();
clear_outstanding_TvbRange();
clear_outstanding_Pinfo();
clear_outstanding_Column();
clear_outstanding_Columns();

2
epan/wslua/wslua.h
View File

@ -65,6 +65,7 @@
struct _wslua_tvb {
tvbuff_t* ws_tvb;
gboolean expired;
gboolean need_free;
};
struct _wslua_pinfo {
@ -399,6 +400,7 @@ extern int Proto_commit(lua_State* L);
extern Tvb* push_Tvb(lua_State* L, tvbuff_t* tvb);
extern void clear_outstanding_Tvb(void);
extern void clear_outstanding_TvbRange(void);
extern Pinfo* push_Pinfo(lua_State* L, packet_info* p);
extern void clear_outstanding_Pinfo(void);

3
epan/wslua/wslua_dumper.c
View File

@ -175,7 +175,8 @@ static const char* cross_plat_fname(const char* fname) {
static char fname_clean[256];
char* f;
strncpy(fname_clean,fname,256);
g_strlcpy(fname_clean,fname,255);
fname_clean[255] = '\0';
for(f = fname_clean; *f; f++) {
switch(*f) {

4
epan/wslua/wslua_proto.c
View File

@ -574,10 +574,10 @@ static true_false_string* true_false_string_from_table(lua_State* L, int idx) {
/* arrays in LUA start with index number 1 */
if ((guint32)lua_tonumber(L,-2) == 1)
tf.true_string = strdup(lua_tostring(L,-1));
tf.true_string = g_strdup(lua_tostring(L,-1));
if ((guint32)lua_tonumber(L,-2) == 2)
tf.false_string = strdup(lua_tostring(L,-1));
tf.false_string = g_strdup(lua_tostring(L,-1));
lua_pop(L, 1);
}

68
epan/wslua/wslua_tvb.c
View File

@ -350,13 +350,49 @@ static GPtrArray* outstanding_TvbRange = NULL;
#define PUSH_TVB(L,t) {g_ptr_array_add(outstanding_Tvb,t);pushTvb(L,t);}
#define PUSH_TVBRANGE(L,t) {g_ptr_array_add(outstanding_TvbRange,t);pushTvbRange(L,t);}
CLEAR_OUTSTANDING(Tvb,expired, TRUE)
static void free_Tvb(Tvb tvb) {
if (!tvb) return;
if (!tvb->expired) {
tvb->expired = TRUE;
} else {
if (tvb->need_free)
tvb_free(tvb->ws_tvb);
g_free(tvb);
}
}
void clear_outstanding_Tvb(void) {
while (outstanding_Tvb->len) {
Tvb tvb = (Tvb)g_ptr_array_remove_index_fast(outstanding_Tvb,0);
free_Tvb(tvb);
}
}
static void free_TvbRange(TvbRange tvbr) {
if (!(tvbr && tvbr->tvb)) return;
if (!tvbr->tvb->expired) {
tvbr->tvb->expired = TRUE;
} else {
free_Tvb(tvbr->tvb);
g_free(tvbr);
}
}
void clear_outstanding_TvbRange(void) {
while (outstanding_TvbRange->len) {
TvbRange tvbr = (TvbRange)g_ptr_array_remove_index_fast(outstanding_TvbRange,0);
free_TvbRange(tvbr);
}
}
Tvb* push_Tvb(lua_State* L, tvbuff_t* ws_tvb) {
Tvb tvb = g_malloc(sizeof(struct _wslua_tvb));
tvb->ws_tvb = ws_tvb;
tvb->expired = FALSE;
tvb->need_free = FALSE;
g_ptr_array_add(outstanding_Tvb,tvb);
return pushTvb(L,tvb);
}
@ -386,6 +422,7 @@ WSLUA_CONSTRUCTOR ByteArray_tvb (lua_State *L) {
tvb = g_malloc(sizeof(struct _wslua_tvb));
tvb->ws_tvb = tvb_new_real_data(data, ba->len,ba->len);
tvb->expired = FALSE;
tvb->need_free = TRUE;
tvb_set_free_cb(tvb->ws_tvb, g_free);
add_new_data_source(lua_pinfo, tvb->ws_tvb, name);
@ -409,6 +446,7 @@ WSLUA_CONSTRUCTOR TvbRange_tvb (lua_State *L) {
if (tvb_offset_exists(tvbr->tvb->ws_tvb, tvbr->offset + tvbr->len -1 )) {
tvb = g_malloc(sizeof(struct _wslua_tvb));
tvb->expired = FALSE;
tvb->need_free = FALSE;
tvb->ws_tvb = tvb_new_subset(tvbr->tvb->ws_tvb,tvbr->offset,tvbr->len, tvbr->len);
PUSH_TVB(L, tvb);
return 1;
@ -439,12 +477,7 @@ WSLUA_METAMETHOD Tvb__tostring(lua_State* L) {
static int Tvb__gc(lua_State* L) {
Tvb tvb = checkTvb(L,1);
if (!tvb) return 0;
if (!tvb->expired)
tvb->expired = TRUE;
else
g_free(tvb);
free_Tvb(tvb);
return 0;
@ -554,10 +587,11 @@ static TvbRange new_TvbRange(lua_State* L, tvbuff_t* ws_tvb, int offset, int len
return NULL;
}
tvbr = ep_alloc(sizeof(struct _wslua_tvbrange));
tvbr = g_malloc(sizeof(struct _wslua_tvbrange));
tvbr->tvb = g_malloc(sizeof(struct _wslua_tvb));
tvbr->tvb->ws_tvb = ws_tvb;
tvbr->tvb->expired = FALSE;
tvbr->tvb->need_free = FALSE;
tvbr->offset = offset;
tvbr->len = len;
@ -1219,6 +1253,15 @@ WSLUA_METHOD TvbRange_range(lua_State* L) {
return 0;
}
static int TvbRange__gc(lua_State* L) {
TvbRange tvbr = checkTvbRange(L,1);
free_TvbRange(tvbr);
return 0;
}
WSLUA_METHOD TvbRange_len(lua_State* L) {
/* Obtain the length of a TvbRange */
TvbRange tvbr = checkTvbRange(L,1);
@ -1228,8 +1271,8 @@ WSLUA_METHOD TvbRange_len(lua_State* L) {
luaL_error(L,"expired tvb");
return 0;
}
lua_pushnumber(L,(lua_Number)tvbr->len);
return 1;
lua_pushnumber(L,(lua_Number)tvbr->len);
return 1;
}
WSLUA_METHOD TvbRange_offset(lua_State* L) {
@ -1241,8 +1284,8 @@ WSLUA_METHOD TvbRange_offset(lua_State* L) {
luaL_error(L,"expired tvb");
return 0;
}
lua_pushnumber(L,(lua_Number)tvbr->offset);
return 1;
lua_pushnumber(L,(lua_Number)tvbr->offset);
return 1;
}
@ -1297,6 +1340,7 @@ static const luaL_reg TvbRange_meta[] = {
{"__tostring", TvbRange__tostring},
{"__concat", wslua__concat},
{"__call", TvbRange_range},
{"__gc", TvbRange__gc},
{ NULL, NULL }
};

8
epan/wslua/wslua_util.c
View File

@ -161,7 +161,7 @@ static char* wslua_get_actual_filename(const char* fname) {
char* f;
char* filename;
strncpy(fname_clean,fname,255);
g_strlcpy(fname_clean,fname,255);
fname_clean[255] = '\0';
for(f = fname_clean; *f; f++) {
@ -241,18 +241,20 @@ WSLUA_FUNCTION wslua_dofile(lua_State* L) {
WSLUA_FUNCTION wslua_persconffile_path(lua_State* L) {
#define WSLUA_OPTARG_persconffile_path_FILENAME 1 /* A filename */
const char *fname = luaL_optstring(L, WSLUA_OPTARG_persconffile_path_FILENAME,"");
const char* filename = get_persconffile_path(fname,FALSE,FALSE);
char* filename = get_persconffile_path(fname,FALSE,FALSE);
lua_pushstring(L,filename);
g_free(filename);
WSLUA_RETURN(1); /* The full pathname for a file in the personal configuration directory */
}
WSLUA_FUNCTION wslua_datafile_path(lua_State* L) {
#define WSLUA_OPTARG_datafile_path_FILENAME 1 /* A filename */
const char *fname = luaL_optstring(L, WSLUA_OPTARG_datafile_path_FILENAME,"");
const char* filename = get_datafile_path(fname);
char* filename = get_datafile_path(fname);
lua_pushstring(L,filename);
g_free(filename);
WSLUA_RETURN(1); /* The full pathname for a file in wireshark's configuration directory */
}