osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6982 : 

Check the user-provided custom header string for invalid characters before
trying to register it in an hf; registering invalid characters in an hf will
lead to an assertion.

svn path=/trunk/; revision=41787
This commit is contained in:
Jeff Morriss 2012-03-27 01:43:20 +00:00
parent ad5af7cf85
commit c13c14429b
1 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
epan/dissectors/packet-http.c
View File

@ -131,20 +131,32 @@ static guint num_header_fields = 0;
static GHashTable* header_fields_hash = NULL;
static void
header_fields_update_cb(void* r, const char** err)
header_fields_update_cb(void *r, const char **err)
{
header_field_t* rec = r;
header_field_t *rec = r;
char c;
if (rec->header_name == NULL) {
*err = ep_strdup_printf("Header name can't be empty");
} else {
g_strstrip(rec->header_name);
if (rec->header_name[0] != 0) {
*err = NULL;
} else {
*err = ep_strdup_printf("Header name can't be empty");
}
return;
}
g_strstrip(rec->header_name);
if (rec->header_name[0] == 0) {
*err = ep_strdup_printf("Header name can't be empty");
return;
}
/* Check for invalid characters (to avoid asserting out when
* registering the field).
*/
c = proto_check_field_name(rec->header_name);
if (c) {
*err = ep_strdup_printf("Header name can't contain '%c'", c);
return;
}
*err = NULL;
}
static void *