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

rfc7468: don't use for (;;) for tvb_find_line_end() loops. 

If you're past the end of the tvbuff, tvb_find_line_end() will, when
reassembly is not being done, return a zero-length line without
advancing next_offset, so, unless you check for being past the end of
the tvbuff, you'll loop forever.

Fixes #17801.
This commit is contained in:
Guy Harris 2021-12-25 22:22:31 -08:00
parent b9e299b1a3
commit b3215d99ca
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
epan/dissectors/file-rfc7468.c
View File

@ -150,7 +150,7 @@ dissect_rfc7468(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data
* First, process the text lines prior to the pre-encapsulation
* boundary; they're explanatory text lines.
*/
for (;;) {
while (tvb_offset_exists(tvb, offset)) {
linelen = tvb_find_line_end(tvb, offset, -1, &next_offset, FALSE);
if (linelen == -1) {
/* No complete line was found. Nothing more to do. */
@ -212,7 +212,7 @@ dissect_rfc7468(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data
/*
* Skip over any blank lines before the base64 information.
*/
for (;;) {
while (tvb_offset_exists(tvb, offset)) {
linelen = tvb_find_line_end(tvb, offset, -1, &next_offset, FALSE);
if (linelen == -1) {
/* No complete line was found. We're done. */
@ -257,7 +257,7 @@ dissect_rfc7468(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data
gint base64_state = 0;
guint base64_save = 0;
guint datasize = 0;
for (;;) {
while (tvb_offset_exists(tvb, offset)) {
linelen = tvb_find_line_end(tvb, offset, -1, &next_offset, FALSE);
if (linelen == -1) {
/*