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

epan: Add a bounds check to get_utf_8_string 

Check our current buffer position as well as our length.
Fixes #18758.
This commit is contained in:
Gerald Combs 2022-12-26 10:52:21 -08:00
parent 540b71d738
commit 6c8cdebe87
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
epan/charsets.c
View File

@ -251,8 +251,6 @@ guint8 *
get_utf_8_string(wmem_allocator_t *scope, const guint8 *ptr, gint length)
{
wmem_strbuf_t *str;
const guint8 *prev = ptr;
size_t valid_bytes = 0;
str = wmem_strbuf_new_sized(scope, length+1);
@ -262,14 +260,15 @@ get_utf_8_string(wmem_allocator_t *scope, const guint8 *ptr, gint length)
* U+FFFD Substitution of Maximal Subparts. */
while (length > 0) {
const guint8 *prev = ptr;
size_t valid_bytes = utf_8_validate(prev, length, &ptr);
prev = ptr;
valid_bytes = utf_8_validate(prev, length, &ptr);
if (valid_bytes) {
wmem_strbuf_append_len(str, prev, valid_bytes);
}
length -= (gint)valid_bytes;
if (length) {
length -= (gint)(ptr - prev);
prev += valid_bytes;
if (ptr - prev) {
wmem_strbuf_append_unichar_repl(str);
}
}