slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix integer overflow in several audio plugins.

Browse Source 
Task-number: QTBUG-40804
Change-Id: If006cb7db319bb6fda4ce7eb4f907e897b5d9efa
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
This commit is contained in:
Yoann Lopes
2014-09-03 14:45:50 +02:00
parent 006cdeee92
commit 18d6560db1
10 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/alsa/qalsaaudioinput.cpp
View File

@@ -768,7 +768,7 @@ qint64 QAlsaAudioInput::elapsedUSecs() const
if (deviceState == QAudio::StoppedState) if (deviceState == QAudio::StoppedState)
return 0; return 0;
return clockStamp.elapsed()*1000; return clockStamp.elapsed() * qint64(1000);
} }
void QAlsaAudioInput::reset() void QAlsaAudioInput::reset()

2
src/plugins/alsa/qalsaaudiooutput.cpp
View File

@@ -782,7 +782,7 @@ qint64 QAlsaAudioOutput::elapsedUSecs() const
if (deviceState == QAudio::StoppedState) if (deviceState == QAudio::StoppedState)
return 0; return 0;
return clockStamp.elapsed()*1000; return clockStamp.elapsed() * qint64(1000);
} }
void QAlsaAudioOutput::reset() void QAlsaAudioOutput::reset()

2
src/plugins/opensles/qopenslesaudioinput.cpp
View File

@@ -482,7 +482,7 @@ qint64 QOpenSLESAudioInput::elapsedUSecs() const
if (m_deviceState == QAudio::StoppedState) if (m_deviceState == QAudio::StoppedState)
return 0; return 0;
return m_clockStamp.elapsed() * 1000; return m_clockStamp.elapsed() * qint64(1000);
} }
void QOpenSLESAudioInput::setVolume(qreal vol) void QOpenSLESAudioInput::setVolume(qreal vol)

2
src/plugins/opensles/qopenslesaudiooutput.cpp
View File

@@ -290,7 +290,7 @@ qint64 QOpenSLESAudioOutput::elapsedUSecs() const
if (m_state == QAudio::StoppedState) if (m_state == QAudio::StoppedState)
return 0; return 0;
return m_clockStamp.elapsed() * 1000; return m_clockStamp.elapsed() * qint64(1000);
} }
void QOpenSLESAudioOutput::reset() void QOpenSLESAudioOutput::reset()

2
src/plugins/pulseaudio/qaudioinput_pulse.cpp
View File

@@ -692,7 +692,7 @@ qint64 QPulseAudioInput::elapsedUSecs() const
if (m_deviceState == QAudio::StoppedState) if (m_deviceState == QAudio::StoppedState)
return 0; return 0;
return m_clockStamp.elapsed() * 1000; return m_clockStamp.elapsed() * qint64(1000);
} }
void QPulseAudioInput::reset() void QPulseAudioInput::reset()

2
src/plugins/pulseaudio/qaudiooutput_pulse.cpp
View File

@@ -591,7 +591,7 @@ qint64 QPulseAudioOutput::elapsedUSecs() const
if (m_deviceState == QAudio::StoppedState) if (m_deviceState == QAudio::StoppedState)
return 0; return 0;
return m_clockStamp.elapsed() * 1000; return m_clockStamp.elapsed() * qint64(1000);
} }
void QPulseAudioOutput::reset() void QPulseAudioOutput::reset()

2
src/plugins/qnx-audio/audio/qnxaudioinput.cpp
View File

@@ -194,7 +194,7 @@ qint64 QnxAudioInput::elapsedUSecs() const
if (m_state == QAudio::StoppedState) if (m_state == QAudio::StoppedState)
return 0; return 0;
return m_clockStamp.elapsed() * 1000; return m_clockStamp.elapsed() * qint64(1000);
} }
QAudio::Error QnxAudioInput::error() const QAudio::Error QnxAudioInput::error() const

2
src/plugins/qnx-audio/audio/qnxaudiooutput.cpp
View File

@@ -180,7 +180,7 @@ qint64 QnxAudioOutput::elapsedUSecs() const
if (m_state == QAudio::StoppedState) if (m_state == QAudio::StoppedState)
return 0; return 0;
else else
return m_startTimeStamp.elapsed() * 1000; return m_startTimeStamp.elapsed() * qint64(1000);
} }
QAudio::Error QnxAudioOutput::error() const QAudio::Error QnxAudioOutput::error() const

2
src/plugins/windowsaudio/qwindowsaudioinput.cpp
View File

@@ -706,7 +706,7 @@ qint64 QWindowsAudioInput::elapsedUSecs() const
if (deviceState == QAudio::StoppedState) if (deviceState == QAudio::StoppedState)
return 0; return 0;
return timeStampOpened.elapsed()*1000; return timeStampOpened.elapsed() * qint64(1000);
} }
void QWindowsAudioInput::reset() void QWindowsAudioInput::reset()

2
src/plugins/windowsaudio/qwindowsaudiooutput.cpp
View File

@@ -682,7 +682,7 @@ qint64 QWindowsAudioOutput::elapsedUSecs() const
if (deviceState == QAudio::StoppedState) if (deviceState == QAudio::StoppedState)
return 0; return 0;
return timeStampOpened.elapsed()*1000; return timeStampOpened.elapsed() * qint64(1000);
} }
QAudio::Error QWindowsAudioOutput::error() const QAudio::Error QWindowsAudioOutput::error() const