From 408b498a1268bd1c397b27102f934cc3b2fa95bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stig=20Bj=C3=B8rlykke?= Date: Mon, 9 Sep 2013 21:42:49 +0000 Subject: [PATCH] Return ByteArray as "value" for FieldInfo's with type FT_NONE (which has data). This fixes bug 5201. svn path=/trunk/; revision=51903 --- epan/wslua/wslua_field.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/epan/wslua/wslua_field.c b/epan/wslua/wslua_field.c index b8753c51cf..45eb03d57b 100644 --- a/epan/wslua/wslua_field.c +++ b/epan/wslua/wslua_field.c @@ -62,9 +62,6 @@ WSLUA_METAMETHOD FieldInfo__call(lua_State* L) { FieldInfo fi = checkFieldInfo(L,1); switch(fi->hfinfo->type) { - case FT_NONE: - lua_pushnil(L); - return 1; case FT_BOOLEAN: lua_pushboolean(L,(int)fvalue_get_uinteger(&(fi->value))); return 1; @@ -146,6 +143,12 @@ WSLUA_METAMETHOD FieldInfo__call(lua_State* L) { return 1; } + case FT_NONE: + if (fi->length == 0) { + lua_pushnil(L); + return 1; + } + /* FALLTHROUGH */ case FT_BYTES: case FT_UINT_BYTES: case FT_GUID: