summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKurt Korbatits <kurt.korbatits@nokia.com>2010-07-02 00:12:47 (GMT)
committerSamuli Piippo <samuli.piippo@digia.com>2011-06-09 10:06:27 (GMT)
commit59c55d43caaa6f31d6f45b076e4a5ad30b3f9de4 (patch)
tree0f80c92ba660bb95733bca5be4c8857045c20e0b
parentd65ce6fe36e8f453916437fd5237dd7dc88666e2 (diff)
downloadQt-59c55d43caaa6f31d6f45b076e4a5ad30b3f9de4.zip
Qt-59c55d43caaa6f31d6f45b076e4a5ad30b3f9de4.tar.gz
Qt-59c55d43caaa6f31d6f45b076e4a5ad30b3f9de4.tar.bz2
Segmentation Fault in QAudioOutputPrivate::freeBlocks() caused by wrong
pointer increment Task-number:QTBUG-11883 Reviewed-by:Andrew den Exter (cherry picked from commit 6d5e561be6f013f7cb5c77e15ee6b7640cad7563)
-rw-r--r--src/multimedia/audio/qaudioinput_win32_p.cpp2
-rw-r--r--src/multimedia/audio/qaudiooutput_win32_p.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/multimedia/audio/qaudioinput_win32_p.cpp b/src/multimedia/audio/qaudioinput_win32_p.cpp
index 79336e4..bb7ed56 100644
--- a/src/multimedia/audio/qaudioinput_win32_p.cpp
+++ b/src/multimedia/audio/qaudioinput_win32_p.cpp
@@ -148,7 +148,7 @@ void QAudioInputPrivate::freeBlocks(WAVEHDR* blockArray)
for(int i = 0; i < count; i++) {
waveInUnprepareHeader(hWaveIn,blocks, sizeof(WAVEHDR));
- blocks+=sizeof(WAVEHDR);
+ blocks++;
}
HeapFree(GetProcessHeap(), 0, blockArray);
}
diff --git a/src/multimedia/audio/qaudiooutput_win32_p.cpp b/src/multimedia/audio/qaudiooutput_win32_p.cpp
index 75f5235..5dca487 100644
--- a/src/multimedia/audio/qaudiooutput_win32_p.cpp
+++ b/src/multimedia/audio/qaudiooutput_win32_p.cpp
@@ -146,7 +146,7 @@ void QAudioOutputPrivate::freeBlocks(WAVEHDR* blockArray)
for(int i = 0; i < count; i++) {
waveOutUnprepareHeader(hWaveOut,blocks, sizeof(WAVEHDR));
- blocks+=sizeof(WAVEHDR);
+ blocks++;
}
HeapFree(GetProcessHeap(), 0, blockArray);
}