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

In tvb_get_unicode_string(), if the byte count is odd, ignore the last 

byte.  (We should perhaps add an expert info indication in those cases.)

svn path=/trunk/; revision=54074
This commit is contained in:
Guy Harris 2013-12-13 22:35:50 +00:00
parent bbc3e14642
commit 30ab019f2b
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
epan/tvbuff.c
View File

@ -1884,7 +1884,7 @@ tvb_get_unicode_string(wmem_allocator_t *scope, tvbuff_t *tvb, const gint offset
strbuf = wmem_strbuf_new(scope, NULL);
for(i = 0; i < length; i += 2) {
for(i = 0; i + 1 < length; i += 2) {
if (encoding == ENC_BIG_ENDIAN)
uchar = tvb_get_ntohs(tvb, offset + i);
else
@ -1893,6 +1893,10 @@ tvb_get_unicode_string(wmem_allocator_t *scope, tvbuff_t *tvb, const gint offset
wmem_strbuf_append_unichar(strbuf, uchar);
}
/*
* XXX - if i < length, this means we were handed an odd
* number of bytes, so we're not a valid UCS-2 string.
*/
return (gchar*)wmem_strbuf_get_str(strbuf);
}