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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/12/12 19:48:28

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

Log message:
        (StreamAdapter::readFunc): don't attempt to fetch 0 bytes from 
underlying stream...
        Fixes bug #21779.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5147&r2=1.5148
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/tag_loaders.cpp?cvsroot=gnash&r1=1.166&r2=1.167

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5147
retrieving revision 1.5148
diff -u -b -r1.5147 -r1.5148
--- ChangeLog   12 Dec 2007 18:56:36 -0000      1.5147
+++ ChangeLog   12 Dec 2007 19:48:27 -0000      1.5148
@@ -1,5 +1,10 @@
 2007-12-12 Sandro Santilli <address@hidden>
 
+       * server/swf/tag_loaders.cpp (StreamAdapter::readFunc): don't attempt
+         to fetch 0 bytes from underlying stream... Fixes bug #21779.
+
+2007-12-12 Sandro Santilli <address@hidden>
+
        * libmedia/sound_handler.h: add a reset() method to put
          the sound handler in starting conditions (for movie restart).
        * libmedia/gst/sound_handler_{gst,sdl}.{cpp,h}: implement reset()

Index: server/swf/tag_loaders.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/tag_loaders.cpp,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -b -r1.166 -r1.167
--- server/swf/tag_loaders.cpp  12 Dec 2007 16:35:19 -0000      1.166
+++ server/swf/tag_loaders.cpp  12 Dec 2007 19:48:27 -0000      1.167
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: tag_loaders.cpp,v 1.166 2007/12/12 16:35:19 strk Exp $ */
+/* $Id: tag_loaders.cpp,v 1.167 2007/12/12 19:48:27 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -112,6 +112,7 @@
                unsigned bytesLeft = br->endPos - br->currPos;
                if ( bytesLeft < (unsigned)bytes )
                {
+                       if ( ! bytesLeft ) return 0;
                        log_debug("Requested to read past end of stream range");
                        bytes = bytesLeft;
                }