[Gnash-commit] gnash ChangeLog server/swf/tag_loaders.cpp

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/08/01 21:36:58

Modified files:
        .              : ChangeLog 
        server/swf     : tag_loaders.cpp 

Log message:
                * server/swf/tag_loaders.cpp (define_sound_loader): fix a bug
                  introduced by last commit (sorry)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3905&r2=1.3906
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/tag_loaders.cpp?cvsroot=gnash&r1=1.120&r2=1.121

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3905
retrieving revision 1.3906
diff -u -b -r1.3905 -r1.3906
--- ChangeLog   1 Aug 2007 21:31:57 -0000       1.3905
+++ ChangeLog   1 Aug 2007 21:36:57 -0000       1.3906
@@ -1,5 +1,10 @@
 2007-08-01 Sandro Santilli <address@hidden>
 
+       * server/swf/tag_loaders.cpp (define_sound_loader): fix a bug
+         introduced by last commit (sorry)
+
+2007-08-01 Sandro Santilli <address@hidden>
+
        * server/swf/tag_loaders.cpp: completely remove the bogus assertion
          about the required input bytes in relation to the number of samples.
          Rather, add more ensureBytes() uses, closer to where the data is

Index: server/swf/tag_loaders.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/tag_loaders.cpp,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -b -r1.120 -r1.121
--- server/swf/tag_loaders.cpp  1 Aug 2007 21:31:57 -0000       1.120
+++ server/swf/tag_loaders.cpp  1 Aug 2007 21:36:58 -0000       1.121
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: tag_loaders.cpp,v 1.120 2007/08/01 21:31:57 strk Exp $ */
+/* $Id: tag_loaders.cpp,v 1.121 2007/08/01 21:36:58 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1086,8 +1086,10 @@
            }
 
            unsigned char *data; // Expanded audio data ready for playing
-           unsigned data_bytes; // First it is the amount of data from file,
+
+           // First it is the amount of data from file,
                        // then the amount allocated at *data (it may grow)
+            unsigned data_bytes = in->get_tag_end_position() - 
in->get_position();
 
            // sound_expand allocates storage for data[].
            // and modifies 3 parameters: format, data and data_bytes.