[vlc-devel] commit: wav: fix integer underflow ( Rémi Denis-Courmont )

[git version control]

vlc | branch: master | Rémi Denis-Courmont <rdenis at simphalempin.com> | Sat Jun 28 14:10:15 2008 +0300| [d97af9aeb77ec6a505fc37a5a55c5ae85bb6ea35]

wav: fix integer underflow
(cherry picked from commit 105335dd73917555335c03460aaa67fcdb9d4a55)

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d97af9aeb77ec6a505fc37a5a55c5ae85bb6ea35
---

 modules/demux/wav.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/modules/demux/wav.c b/modules/demux/wav.c
index 045344a..e174ac4 100644
--- a/modules/demux/wav.c
+++ b/modules/demux/wav.c
@@ -178,7 +178,9 @@ static int Open( vlc_object_t * p_this )
     /* see the following link for more information:
      * http://www.microsoft.com/whdc/device/audio/multichaud.mspx#EFAA */
     if( GetWLE( &p_wf->wFormatTag ) == WAVE_FORMAT_EXTENSIBLE &&
-        i_size >= sizeof( WAVEFORMATEXTENSIBLE ) )
+        i_size >= sizeof( WAVEFORMATEXTENSIBLE ) &&
+        ( p_sys->fmt.i_extra + sizeof( WAVEFORMATEX )
+            >= sizeof( WAVEFORMATEXTENSIBLE ) ) )
     {
         unsigned i, i_channel_mask;
         GUID guid_subformat;