From 713d534c390ce3ed15c340bcec2fa48f6de6521e Mon Sep 17 00:00:00 2001 From: mcmartin Date: Sat, 29 Nov 2008 06:19:11 +0000 Subject: [PATCH] Fixed a double-free bug in the new Legacy Video code and added files to the Windows project file. git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3103 8092fc87-c524-0410-9efc-e669fe64eaf9 --- sc2/src/msvc++/UrQuanMasters.dsp | 12 ++++++++++++ sc2/src/sc2code/libs/video/vresins.c | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/sc2/src/msvc++/UrQuanMasters.dsp b/sc2/src/msvc++/UrQuanMasters.dsp index 1bc5f9e57..a97457567 100644 --- a/sc2/src/msvc++/UrQuanMasters.dsp +++ b/sc2/src/msvc++/UrQuanMasters.dsp @@ -916,6 +916,10 @@ SOURCE=..\sc2code\libs\video\dukvid.h # End Source File # Begin Source File +SOURCE=..\sc2code\libs\video\legacyplayer.c +# End Source File +# Begin Source File + SOURCE=..\sc2code\libs\video\vfileins.c # End Source File # Begin Source File @@ -936,12 +940,20 @@ SOURCE=..\sc2code\libs\video\videodec.h # End Source File # Begin Source File +SOURCE=..\sc2code\libs\video\vidintrn.h +# End Source File +# Begin Source File + SOURCE=..\sc2code\libs\video\vidplayer.c # End Source File # Begin Source File SOURCE=..\sc2code\libs\video\vidplayer.h # End Source File +# Begin Source File + +SOURCE=..\sc2code\libs\video\vresins.c +# End Source File # End Group # Begin Group "threads" diff --git a/sc2/src/sc2code/libs/video/vresins.c b/sc2/src/sc2code/libs/video/vresins.c index 192f5a674..4c69377b6 100644 --- a/sc2/src/sc2code/libs/video/vresins.c +++ b/sc2/src/sc2code/libs/video/vresins.c @@ -34,7 +34,7 @@ FreeLegacyVideoData (void *data) if (pLV->audio) HFree (pLV->audio); if (pLV->speech) - HFree (pLV->video); + HFree (pLV->speech); HFree (pLV); return TRUE;