diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2021-05-20 12:58:06 +0200 |
|---|---|---|
| committer | Wireshark GitLab Utility <gerald+gitlab-utility@wireshark.org> | 2021-05-20 12:21:06 +0000 |
| commit | 31ca47eafcce356841a6bfc99c918013f4695f01 (patch) | |
| tree | 69b7f44c3e664b6d904ef7d28695c3995a625c16 /epan/tvbuff.c | |
| parent | f54221b5796d021c544577d4f9d828ede25999d0 (diff) | |
Use ENC_APN_STR in one more place.
Diffstat (limited to 'epan/tvbuff.c')
| -rw-r--r-- | epan/tvbuff.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/epan/tvbuff.c b/epan/tvbuff.c index 0c26a2f9f0..545ce3e972 100644 --- a/epan/tvbuff.c +++ b/epan/tvbuff.c @@ -1630,11 +1630,11 @@ validate_single_byte_ascii_encoding(const guint encoding) case ENC_KEYPAD_ABC_TBCD: case ENC_KEYPAD_BC_TBCD: case ENC_ETSI_TS_102_221_ANNEX_A: - case ENC_APN_STR: - REPORT_DISSECTOR_BUG("Invalid string encoding type passed to tvb_get_string_XXX"); - break; + case ENC_APN_STR: + REPORT_DISSECTOR_BUG("Invalid string encoding type passed to tvb_get_string_XXX"); + break; default: - break; + break; } /* make sure something valid was set */ if (enc == 0) @@ -3107,6 +3107,8 @@ tvb_get_string_enc(wmem_allocator_t *scope, tvbuff_t *tvb, const gint offset, name_len = name_len + strptr[tmp] + 1; strptr[tmp] = '.'; } + } else { + strptr = (char*)""; } } break; |