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

"It's not a valid text line" means "it's not an RFC 7468 file", not "it's bad". 

Don't return an error unless we get a read error.  If the line could be
read, but isn't a valid text line, that just means it's not an RFC 7468
text file.

Change-Id: I04f48294cac213cf61b8dcb851b99dc6dd776df8
Reviewed-on: https://code.wireshark.org/review/29039
Reviewed-by: Guy Harris <guy@alum.mit.edu>
This commit is contained in:
Guy Harris 2018-08-09 03:04:19 -07:00
parent 1ac6908cea
commit f543d4a2fd
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wiretap/rfc7468.c
View File

@ -67,14 +67,12 @@ static char *read_complete_text_line(char line[MAX_LINE_LENGTH], FILE_T fh, int
}
if (strlen(line) != (size_t)(line_end - line)) {
*err = WTAP_ERR_BAD_FILE;
*err_info = g_strdup("unexpected NUL inside a line");
*err = 0;
return NULL;
}
if (line_end[-1] != '\n' && !file_eof(fh)) {
*err = WTAP_ERR_BAD_FILE;
*err_info = g_strdup("overlong line");
*err = 0;
return NULL;
}
@ -132,7 +130,7 @@ wtap_open_return_val rfc7468_open(wtap *wth, int *err, gchar **err_info)
found_preeb = FALSE;
for (unsigned int i = 0; i < MAX_EXPLANATORY_TEXT_LINES; i++) {
if (!read_complete_text_line(line, wth->fh, err, err_info)) {
if (*err == WTAP_ERR_SHORT_READ)
if (*err == 0 || *err == WTAP_ERR_SHORT_READ)
return WTAP_OPEN_NOT_MINE;
return WTAP_OPEN_ERROR;
}