[Gnash-commit] gnash ChangeLog extensions/fileio/Makefile.am e...

[Udo Giacomozzi]

CVSROOT:        /cvsroot/gnash
Module name:    gnash
Changes by:     Udo Giacomozzi <udog>   07/10/24 16:27:26

Modified files:
        .              : ChangeLog 
        extensions/fileio: Makefile.am fileio.cpp 

Log message:
        extensions/fileio/fileio.cpp: Fixed a bug in fgets() which caused a 
segfault on empty files

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4688&r2=1.4689
http://cvs.savannah.gnu.org/viewcvs/gnash/extensions/fileio/Makefile.am?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/extensions/fileio/fileio.cpp?cvsroot=gnash&r1=1.15&r2=1.16

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/gnash/gnash/ChangeLog,v
retrieving revision 1.4688
retrieving revision 1.4689
diff -u -b -r1.4688 -r1.4689
--- ChangeLog   24 Oct 2007 15:55:02 -0000      1.4688
+++ ChangeLog   24 Oct 2007 16:27:25 -0000      1.4689
@@ -1,3 +1,8 @@
+2007-10-24 Udo Giacomozzi <address@hidden>
+
+       * extensions/fileio/fileio.cpp: Fixed a bug in fgets() which
+         caused a segfault on empty files      
+
 2007-10-24 Sandro Santilli <address@hidden>
 
        * cygnal/ACT/Makefile.am: distribute test_support and unit_tests

Index: extensions/fileio/Makefile.am
===================================================================
RCS file: /cvsroot/gnash/gnash/extensions/fileio/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- extensions/fileio/Makefile.am       1 Jul 2007 10:53:58 -0000       1.6
+++ extensions/fileio/Makefile.am       24 Oct 2007 16:27:25 -0000      1.7
@@ -61,7 +61,7 @@
        $(RM) $(DESTDIR)$(pluginsdir)/*.a 
 
 test: $(srcdir)/../../testsuite/generic-testrunner.sh test.swf
-       GNASH_PLUGINS=$(PWD) GNASHRC=$(srcdir)/../gnashrc sh $< $(top_builddir) 
test.swf > $@
+       GNASH_PLUGINS=$(PWD)/.libs GNASHRC=$(srcdir)/../gnashrc sh $< 
$(top_builddir) test.swf > $@
        chmod +x $@
 
 test.swf: test.as

Index: extensions/fileio/fileio.cpp
===================================================================
RCS file: /cvsroot/gnash/gnash/extensions/fileio/fileio.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- extensions/fileio/fileio.cpp        1 Jul 2007 10:53:58 -0000       1.15
+++ extensions/fileio/fileio.cpp        24 Oct 2007 16:27:25 -0000      1.16
@@ -237,7 +237,11 @@
     if (_stream) {
         char buf[BUFSIZE];
         memset(buf, 0, BUFSIZE);
-        str = ::fgets(buf, BUFSIZE, _stream);
+        char* res = ::fgets(buf, BUFSIZE, _stream);
+        if (res) 
+          str = res;
+        else
+          str = "";  // we might want to return NULL to the VM ?
         return str;
     }
     return str;