CVSROOT: /sources/gnash Module name: gnash Changes by: Martin Guy <martinwguy> 07/05/22 22:51:01
Modified files: . : ChangeLog server/swf : tag_loaders.cpp Log message: * server/swf/tag_loaders.cpp: Fix NELLYMOSER bombing out CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3311&r2=1.3312 http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/tag_loaders.cpp?cvsroot=gnash&r1=1.105&r2=1.106 Patches: Index: ChangeLog =================================================================== RCS file: /sources/gnash/gnash/ChangeLog,v retrieving revision 1.3311 retrieving revision 1.3312 diff -u -b -r1.3311 -r1.3312 --- ChangeLog 22 May 2007 20:23:32 -0000 1.3311 +++ ChangeLog 22 May 2007 22:51:00 -0000 1.3312 @@ -1,3 +1,8 @@ +2007-05-22 Martin Guy <[EMAIL PROTECTED]> + + * configure.ac: add help text for ffmpeg-devel RPM package + * server/swf/tag_loaders.cpp: Fix NELLYMOSER bombing out + 2007-05-22 Sandro Santilli <[EMAIL PROTECTED]> * server/swf/tag_loaders.cpp (place_object_2_loader): don't Index: server/swf/tag_loaders.cpp =================================================================== RCS file: /sources/gnash/gnash/server/swf/tag_loaders.cpp,v retrieving revision 1.105 retrieving revision 1.106 diff -u -b -r1.105 -r1.106 --- server/swf/tag_loaders.cpp 22 May 2007 20:23:33 -0000 1.105 +++ server/swf/tag_loaders.cpp 22 May 2007 22:51:00 -0000 1.106 @@ -17,7 +17,7 @@ // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA // -/* $Id: tag_loaders.cpp,v 1.105 2007/05/22 20:23:33 strk Exp $ */ +/* $Id: tag_loaders.cpp,v 1.106 2007/05/22 22:51:00 martinwguy Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -1459,6 +1459,9 @@ bool sample_16bit, bool stereo, unsigned char* &data, unsigned &data_bytes) { + // Make sure that an unassigned pointer cannot get through + data = NULL; + switch (format) { case sound_handler::FORMAT_ADPCM: @@ -1540,6 +1543,7 @@ case sound_handler::FORMAT_NELLYMOSER: // One day... in->skip_bytes(data_bytes); + data = NULL; break; // This is impossible as an input but stops fussy compilers _______________________________________________ Gnash-commit mailing list Gnash-commit@gnu.org http://lists.gnu.org/mailman/listinfo/gnash-commit