CVSROOT: /sources/gnash
Module name: gnash
Changes by: Tomas Groth <tgc> 07/10/06 09:53:45
Modified files:
. : ChangeLog
libmedia/sdl : AudioDecoderFfmpeg.cpp sound_handler_sdl.cpp
Log message:
* libmedia/sdl/AudioDecoderFfmpeg.cpp: Release allocate data on
errors.
* libmedia/sdl/sound_handler_sdl.cpp: Allocate active_sound as
an object.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4554&r2=1.4555
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/sdl/AudioDecoderFfmpeg.cpp?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/sdl/sound_handler_sdl.cpp?cvsroot=gnash&r1=1.3&r2=1.4
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4554
retrieving revision 1.4555
diff -u -b -r1.4554 -r1.4555
--- ChangeLog 6 Oct 2007 09:06:27 -0000 1.4554
+++ ChangeLog 6 Oct 2007 09:53:44 -0000 1.4555
@@ -1,3 +1,8 @@
+2007-10-06 Tomas Groth Christensen <[EMAIL PROTECTED]>
+
+ * libmedia/sdl/AudioDecoderFfmpeg.cpp: Release allocate data on errors.
+ * libmedia/sdl/sound_handler_sdl.cpp: Allocate active_sound as an
object.
+
2007-10-06 Sandro Santilli <[EMAIL PROTECTED]>
* server/sprite_instance.cpp (sprite_attach_movie): remove useless
Index: libmedia/sdl/AudioDecoderFfmpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/libmedia/sdl/AudioDecoderFfmpeg.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- libmedia/sdl/AudioDecoderFfmpeg.cpp 4 Oct 2007 09:41:45 -0000 1.4
+++ libmedia/sdl/AudioDecoderFfmpeg.cpp 6 Oct 2007 09:53:45 -0000 1.5
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-// $Id: AudioDecoderFfmpeg.cpp,v 1.4 2007/10/04 09:41:45 tgc Exp $
+// $Id: AudioDecoderFfmpeg.cpp,v 1.5 2007/10/06 09:53:45 tgc Exp $
#include "AudioDecoderFfmpeg.h"
@@ -211,6 +211,7 @@
// from the active sound list later on.
decodedBytes = 0;
outputSize = 0;
+ delete [] output;
return NULL;
}
@@ -221,6 +222,8 @@
if (bufsize < 1) {
decodedBytes = 0;
outputSize = 0;
+ delete [] output;
+ log_error(_("Error while decoding audio data."));
return NULL;
}
Index: libmedia/sdl/sound_handler_sdl.cpp
===================================================================
RCS file: /sources/gnash/gnash/libmedia/sdl/sound_handler_sdl.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- libmedia/sdl/sound_handler_sdl.cpp 3 Oct 2007 21:43:05 -0000 1.3
+++ libmedia/sdl/sound_handler_sdl.cpp 6 Oct 2007 09:53:45 -0000 1.4
@@ -20,7 +20,7 @@
// Based on sound_handler_sdl.cpp by Thatcher Ulrich http://tulrich.com 2003
// which has been donated to the Public Domain.
-// $Id: sound_handler_sdl.cpp,v 1.3 2007/10/03 21:43:05 tgc Exp $
+// $Id: sound_handler_sdl.cpp,v 1.4 2007/10/06 09:53:45 tgc Exp $
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -177,7 +177,7 @@
}
// Make a "active_sound" for this sound which is later placed on the
vector of instances of this sound being played
- std::auto_ptr<active_sound> sound ( new active_sound );
+ std::auto_ptr<active_sound> sound ( new active_sound() );
// Set source data to the active_sound
sound->set_data(sounddata);
_______________________________________________
Gnash-commit mailing list
Gnash-commit@gnu.org
http://lists.gnu.org/mailman/listinfo/gnash-commit
