CID 709185: refclock_chu.c will leak fd==0 (which should be impossible)

bk: 50026740AlMejDWW-NVg9WVWs6frbw

diff --git a/ChangeLog b/ChangeLog
index 9f1d15fe62672df69a2c51c59fdae31be786d2ba..ba090da6b9a8ee005ab9f2aeb6c3ffacabf75663 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* CID 709185: refclock_chu.c will leak fd==0 (which should be impossible).
 (4.2.7p288) 2012/07/03 Released by Harlan Stenn <stenn@ntp.org>
 * CID 709173: Make sure a libisc function we do not use is called properly.
 (4.2.7p287) 2012/07/03 Released by Harlan Stenn <stenn@ntp.org>

diff --git a/ntpd/refclock_chu.c b/ntpd/refclock_chu.c
index fd9513afab8ed67953fda3467f01d297da967426..48b67536fb9410a8daa832cc17a113d9389ed730 100644 (file)
--- a/ntpd/refclock_chu.c
+++ b/ntpd/refclock_chu.c
@@ -480,6 +480,17 @@ chu_start(
         * Open audio device. Don't complain if not there.
         */
        fd_audio = audio_init(DEVICE_AUDIO, AUDIO_BUFSIZ, unit);
+
+       /*
+       ** refclock_irig.c and refclock_wwv.c call audio_init() too,
+       ** but they tolerate fd == 0.
+       **
+       ** This code will leak a file descriptor if it is 0.
+       **
+       ** For now...
+       */
+       INSIST(0 != fd_audio);  /* Coverity 709185 */
+
 #ifdef DEBUG
        if (fd_audio > 0 && debug)
                audio_show();