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

Return an error value for the new error return; it "can't happen" (but 

either the VC++ analyzer can't determine that or it *can*, in fact,
happen).  Pick an error code that's not too far off.

svn path=/trunk/; revision=35957
This commit is contained in:
Guy Harris 2011-02-16 02:21:31 +00:00
parent 59f65ab815
commit 965ecf3056
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wiretap/ngsniffer.c
View File

@ -2463,8 +2463,14 @@ ng_file_read(void *buffer, size_t elementsize, size_t numelements, wtap *wth,
if (is_random) {
/* Move to the next blob in the list. */
ngsniffer->current_blob = g_list_next(ngsniffer->current_blob);
if (!ngsniffer->current_blob)
if (!ngsniffer->current_blob) {
/*
* XXX - this "can't happen"; we should have a
* blob for every byte in the file.
*/
*err = WTAP_ERR_CANT_SEEK;
return -1;
}
blob = ngsniffer->current_blob->data;
} else {
/* If we also have a random stream open, add a new element,