Added check for invalid chars in abbrev in ProtoField functions.

This fixes bug 5569.

svn path=/trunk/; revision=37787

1 files changed, 20 insertions, 0 deletions

diff --git a/epan/wslua/wslua_proto.c b/epan/wslua/wslua_proto.c
index a4aa2fe11a..e4f32b52d8 100644
--- a/epan/wslua/wslua_proto.c
+++ b/epan/wslua/wslua_proto.c
@@ -610,6 +610,11 @@ WSLUA_CONSTRUCTOR ProtoField_new(lua_State* L) { /* Creates a new field to be us
     if (f->type == FT_NONE)
         WSLUA_ARG_ERROR(ProtoField_new,TYPE,"invalid FT_type");
 
+    if (proto_check_field_name(f->abbr)) {
+      WSLUA_ARG_ERROR(ProtoField_new,ABBR,"Invalid char in abbrev");
+      return 0;
+    }
+
     if (! lua_isnil(L,WSLUA_OPTARG_ProtoField_new_VOIDSTRING) ) {
         if (f->type == FT_BOOLEAN) {
             tfs = true_false_string_from_table(L,WSLUA_OPTARG_ProtoField_new_VOIDSTRING);
@@ -664,6 +669,11 @@ static int ProtoField_integer(lua_State* L, enum ftenum type) {
         return 0;
     }
 
+    if (proto_check_field_name(abbr)) {
+      luaL_argerror(L, 1, "Invalid char in abbrev");
+      return 0;
+    }
+
     f->hfid = -2;
     f->ett = -1;
     f->name = g_strdup(name);
@@ -816,6 +826,11 @@ static int ProtoField_boolean(lua_State* L, enum ftenum type) {
         return 0;
     }
 
+    if (proto_check_field_name(abbr)) {
+      luaL_argerror(L,1,"Invalid char in abbrev");
+      return 0;
+    }
+
     f->hfid = -2;
     f->ett = -1;
     f->name = g_strdup(name);
@@ -854,6 +869,11 @@ static int ProtoField_other(lua_State* L,enum ftenum type) {
     const gchar* name = luaL_optstring(L,2,abbr);
     const gchar* blob = luaL_optstring(L,3,NULL);
 
+    if (proto_check_field_name(abbr)) {
+      luaL_argerror(L,1,"Invalid char in abbrev");
+      return 0;
+    }
+
     f->hfid = -2;
     f->ett = -1;
     f->name = g_strdup(name);