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

conversation: Fix conversation_element_list_values. 

Fix a misplaced brace in debug-only function conversation_element_list_values.
(The "#if 0" means that the compiler didn't catch it.)

Move the type_names array to file-level to avoid the two copies getting out of
sync again.

Add a DISSECTOR_ASSERT to ensure that input conversation_element_type values
are within range.
This commit is contained in:
Darius Davis 2024-02-07 10:11:40 +10:00
parent b5d010d44e
commit 2de251261d
1 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
epan/conversation.c
View File

@ -70,6 +70,18 @@ enum {
ENDP_NO_PORTS_IDX = ADDR2_IDX
};
/* Names for conversation_element_type values. */
static const char *type_names[] = {
"endpoint",
"address",
"port",
"string",
"uint",
"uint64",
"int",
"int64",
};
/*
* Hash table of hash tables for conversations identified by element lists.
*/
@ -143,21 +155,12 @@ conversation_get_key_type(conversation_element_t *elements)
/* Create a string based on element types. */
static char*
conversation_element_list_name(wmem_allocator_t *allocator, conversation_element_t *elements) {
const char *type_names[] = {
"endpoint",
"address",
"port",
"string",
"uint",
"uint64",
"int",
"int64",
};
char *sep = "";
wmem_strbuf_t *conv_hash_group = wmem_strbuf_new(allocator, "");
size_t element_count = conversation_element_count(elements);
for (size_t i = 0; i < element_count; i++) {
conversation_element_t *cur_el = &elements[i];
DISSECTOR_ASSERT(cur_el->type < array_length(type_names));
wmem_strbuf_append_printf(conv_hash_group, "%s%s", sep, type_names[cur_el->type]);
sep = ",";
}
@ -166,14 +169,6 @@ conversation_element_list_name(wmem_allocator_t *allocator, conversation_element
#if 0 // debugging
static char* conversation_element_list_values(conversation_element_t *elements) {
const char *type_names[] = {
"endpoint",
"address",
"port",
"string",
"uint",
"uint64",
};
char *sep = "";
GString *value_str = g_string_new("");
size_t element_count = conversation_element_count(elements);
@ -207,10 +202,10 @@ static char* conversation_element_list_values(conversation_element_t *elements)
case CE_INT:
g_string_append_printf(value_str, "%d", cur_el->int_val);
break;
}
case CE_INT64:
g_string_append_printf(value_str, "%" PRId64, cur_el->int64_val);
break;
}
}
return g_string_free(value_str, FALSE);
}