summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demux_audio.c
diff options
context:
space:
mode:
authorrtognimp <rtognimp@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-04-15 20:48:27 +0000
committerrtognimp <rtognimp@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-04-15 20:48:27 +0000
commit2e8a397fadc9c6f6aa6abae0410ed6e2837d849f (patch)
tree99b904e5fa115579047c902290619dd1efaa9a8f /libmpdemux/demux_audio.c
parentd81b02cce8d5e3b1d3cf2091f93376eca9e921a4 (diff)
downloadmpv-2e8a397fadc9c6f6aa6abae0410ed6e2837d849f.tar.bz2
mpv-2e8a397fadc9c6f6aa6abae0410ed6e2837d849f.tar.xz
10l to me: writing outside allocated memory
Patch by Mikulas Patocka < mikulas (at) artax (dot) karlin (dot) mff (dot) cuni (dot) cz> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12214 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demux_audio.c')
-rw-r--r--libmpdemux/demux_audio.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libmpdemux/demux_audio.c b/libmpdemux/demux_audio.c
index 390df643f6..171f5f1535 100644
--- a/libmpdemux/demux_audio.c
+++ b/libmpdemux/demux_audio.c
@@ -168,7 +168,7 @@ int demux_audio_open(demuxer_t* demuxer) {
free_sh_audio(sh_audio);
return 0;
}
- sh_audio->wf = w = (WAVEFORMATEX*)malloc(l);
+ sh_audio->wf = w = (WAVEFORMATEX*)malloc(l > sizeof(WAVEFORMATEX) ? l : sizeof(WAVEFORMATEX));
w->wFormatTag = sh_audio->format = stream_read_word_le(s);
w->nChannels = sh_audio->channels = stream_read_word_le(s);
w->nSamplesPerSec = sh_audio->samplerate = stream_read_dword_le(s);