FreeBSD source tree https://cgit-dev.freebsd.org/src/atom?h=releng%2F12.2 2017-10-31T00:07:04Z 2017-10-31T00:07:04Z Bryan Drewery bdrewery@FreeBSD.org 2017-10-31T00:07:04Z urn:sha1:ea825d02749f382c3f7e17f28247f20a48733eab Sponsored by: Dell EMC Isilon 2016-06-08T02:14:05Z Don Lewis truckman@FreeBSD.org 2016-06-08T02:14:05Z urn:sha1:290dadbd560601bc99dd1b6e721d3c2a3c0d329a Rather than guarding close(fd) with an fd >= 0 test and setting fd to -1 when it is closed to avoid a potential double-close, just move the close() call after the conditional "goto make_token". This moves the close() call totally outside the loop to avoid the possibility of calling it twice. This should also prevent a Coverity warning about checking fd for validity after it was previously passed to read(). Reported by: Coverity CID: 1355335 MFC after: 1 week X-MFC with: r299484 2016-05-11T22:04:28Z Conrad Meyer cem@FreeBSD.org 2016-05-11T22:04:28Z urn:sha1:7bfdbca59613182ce7f7a5e1082fc1e76f612783 In the case where a file lacks a trailing newline, there is some "evil" code to reverse goto the tokenizing code ("make_token") for the final token in the file. In this case, 'fd' is closed more than once. Use a negative sentinel value to guard close(2), preventing the double close. Ideally, this code would be restructured to avoid this ugly construction. Reported by: Coverity CID: 1006123 Sponsored by: EMC / Isilon Storage Division 2015-10-02T10:08:11Z Colin Percival cperciva@FreeBSD.org 2015-10-02T10:08:11Z urn:sha1:6ae1554a5d9b318f8ad53ccc39fa5a961403da73 (or what's left of it, at least) into src/usr.bin. This change will not be MFCed. Discussed at: EuroBSDCon 2014 Committed from: EuroBSDCon 2015