[Gnash-commit] gnash ChangeLog libbase/curl_adapter.cpp

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/05/24 22:06:09

Modified files:
        .              : ChangeLog 
        libbase        : curl_adapter.cpp 

Log message:
                * libbase/curl_adapter.cpp (CurlStreamFile::seek): use the 
_cached
                  member for checking wheter a seek will succeed or not (fseek
                  allows you to seek past the end of the file otherwise).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3346&r2=1.3347
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/curl_adapter.cpp?cvsroot=gnash&r1=1.34&r2=1.35

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3346
retrieving revision 1.3347
diff -u -b -r1.3346 -r1.3347
--- ChangeLog   24 May 2007 21:35:01 -0000      1.3346
+++ ChangeLog   24 May 2007 22:06:09 -0000      1.3347
@@ -1,3 +1,9 @@
+2007-05-24 Sandro Santilli <address@hidden>
+
+       * libbase/curl_adapter.cpp (CurlStreamFile::seek): use the _cached
+         member for checking wheter a seek will succeed or not (fseek
+         allows you to seek past the end of the file otherwise).
+
 2007-05-24 Bastiaan Jacques <address@hidden>
 
        * gui/Makefile.am: When building FLTK GUI, also include

Index: libbase/curl_adapter.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/curl_adapter.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- libbase/curl_adapter.cpp    23 May 2007 07:42:16 -0000      1.34
+++ libbase/curl_adapter.cpp    24 May 2007 22:06:09 -0000      1.35
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: curl_adapter.cpp,v 1.34 2007/05/23 07:42:16 tgc Exp $ */
+/* $Id: curl_adapter.cpp,v 1.35 2007/05/24 22:06:09 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -538,6 +538,12 @@
        fill_cache(pos);
        if ( _error ) return false; // error can be set by fill_cache
 
+       if ( _cached < pos )
+       {
+               fprintf(stderr, "Warning: could not cache anough bytes on 
seek\n");
+               return false; // couldn't cache so many bytes
+       }
+
        if ( fseek(_cache, pos, SEEK_SET) == -1 ) {
                fprintf(stderr, "Warning: fseek failed\n");
                return false;