osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

wscbor: defer creation of composite tvb 

Prevents an exception in finalize if no tvbs are appended.
This commit is contained in:
Kevin Albertson 2022-12-30 20:57:53 -05:00 committed by AndersBroman
parent 1a1a6ce12b
commit a0c9627502
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
epan/wscbor.c
View File

@ -239,7 +239,7 @@ wscbor_chunk_t * wscbor_chunk_read(wmem_allocator_t *alloc, tvbuff_t *tvb, gint
}
else {
// indefinite length, sequence of definite items
chunk->_priv->str_value = tvb_new_composite();
chunk->_priv->str_value = NULL;
while (TRUE) {
wscbor_head_t *head = wscbor_head_read(alloc, tvb, offset);
@ -264,6 +264,9 @@ wscbor_chunk_t * wscbor_chunk_read(wmem_allocator_t *alloc, tvbuff_t *tvb, gint
*offset += datalen;
chunk->data_length += datalen;
if(datalen) {
if (!chunk->_priv->str_value) {
chunk->_priv->str_value = tvb_new_composite ();
}
tvb_composite_append(
chunk->_priv->str_value,
tvb_new_subset_length(tvb, head->start + head->length, datalen)
@ -282,7 +285,14 @@ wscbor_chunk_t * wscbor_chunk_read(wmem_allocator_t *alloc, tvbuff_t *tvb, gint
chunk->_priv->alloc, &ei_cbor_indef_string,
NULL
));
tvb_composite_finalize(chunk->_priv->str_value);
if (chunk->_priv->str_value) {
tvb_composite_finalize(chunk->_priv->str_value);
}
else {
// Create an empty subset tvb. str_value is expected to be non-NULL for string types.
chunk->_priv->str_value = tvb_new_subset_length (tvb, 0, 0);
}
}
break;
default:

3
epan/wscbor_test.c
View File

@ -43,6 +43,7 @@ example_s ex_uint = {1, (const guint8 *)"\x01", 1, 1, CBOR_TYPE_UINT, 1};
example_s ex_nint = {1, (const guint8 *)"\x20", 1, 1, CBOR_TYPE_NEGINT, 0};
example_s ex_bstr = {3, (const guint8 *)"\x42\x68\x69", 1, 3, CBOR_TYPE_BYTESTRING, 2};
example_s ex_bstr_indef = {6, (const guint8 *)"\x5F\x41\x68\x41\x69\xFF", 1, 6, CBOR_TYPE_BYTESTRING, 0};
example_s ex_bstr_indef_empty = {2, (const guint8 *)"\x5F\xFF", 1, 2, CBOR_TYPE_BYTESTRING, 0};
example_s ex_tstr = {3, (const guint8 *)"\x62\x68\x69", 1, 3, CBOR_TYPE_STRING, 2};
example_s ex_tstr_indef = {6, (const guint8 *)"\x7F\x61\x68\x61\x69\xFF", 1, 6, CBOR_TYPE_STRING, 0};
example_s ex_false = {1, (const guint8 *)"\xF4", 1, 1, CBOR_TYPE_FLOAT_CTRL, CBOR_CTRL_FALSE};
@ -62,7 +63,7 @@ static const example_s * all_examples[] = {
&ex_uint, &ex_nint,
&ex_bstr, &ex_bstr_indef,
&ex_tstr, &ex_tstr_indef,
&ex_false, &ex_true, &ex_null, &ex_undef, &ex_break
&ex_false, &ex_true, &ex_null, &ex_undef, &ex_break, &ex_bstr_indef_empty
};
/*