aboutsummaryrefslogtreecommitdiffstats
path: root/epan/wslua
diff options
context:
space:
mode:
authorPeter Wu <peter@lekensteyn.nl>2016-10-17 17:06:08 +0200
committerAnders Broman <a.broman58@gmail.com>2016-10-18 04:04:25 +0000
commit954e7c4ded574a0a7d2963f979c51b79a038958b (patch)
treef36be7fe02dc7991d7a1d5802c093aded493ccaa /epan/wslua
parent303948500fee5f24600643638e3ed5cc5fa14132 (diff)
wslua: Do not crash on the root tree item
ti->item is NULL for the root item, prevent a NULL-deref by Lua script. Bug: 13017 Change-Id: I5e7f71d014a01bab615288df76509b3ef97b1bf6 Reviewed-on: https://code.wireshark.org/review/18247 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/wslua')
-rw-r--r--epan/wslua/wslua_tree.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/epan/wslua/wslua_tree.c b/epan/wslua/wslua_tree.c
index 716efec384..8e824a8eeb 100644
--- a/epan/wslua/wslua_tree.c
+++ b/epan/wslua/wslua_tree.c
@@ -521,9 +521,10 @@ static int TreeItem_get_text(lua_State* L) {
TreeItem ti = checkTreeItem(L,1);
gchar label_str[ITEM_LABEL_LENGTH+1];
gchar *label_ptr;
- field_info *fi = PITEM_FINFO(ti->item);
- if(fi) {
+ if (ti->item) {
+ field_info *fi = PITEM_FINFO(ti->item);
+
if (!fi->rep) {
label_ptr = label_str;
proto_item_fill_label(fi, label_str);