From f513ca2a2832791466806e253ae9d777a8584808 Mon Sep 17 00:00:00 2001 From: Jonathan Li Date: Sat, 12 Nov 2016 23:18:42 +0000 Subject: [PATCH] cdvdgigaherz:linux: Check ioctl return value Fixes Coverity CID 172718: Unchecked return value Also avoid adding the sector leadout descriptor info to the TOC since it actually isn't used. --- plugins/cdvdGigaherz/src/Unix/LinuxIOCtlSrc.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/plugins/cdvdGigaherz/src/Unix/LinuxIOCtlSrc.cpp b/plugins/cdvdGigaherz/src/Unix/LinuxIOCtlSrc.cpp index 1b1d675085..8015662d49 100644 --- a/plugins/cdvdGigaherz/src/Unix/LinuxIOCtlSrc.cpp +++ b/plugins/cdvdGigaherz/src/Unix/LinuxIOCtlSrc.cpp @@ -192,9 +192,8 @@ bool IOCtlSrc::ReadCDInfo() // TODO: Do I need a fallback if this doesn't work? entry.cdte_track = 0xAA; - ioctl(m_device, CDROMREADTOCENTRY, &entry); - m_toc.push_back({static_cast(entry.cdte_addr.lba), entry.cdte_track, - entry.cdte_adr, entry.cdte_ctrl}); + if (ioctl(m_device, CDROMREADTOCENTRY, &entry) == -1) + return false; m_sectors = entry.cdte_addr.lba; m_media_type = -1;