[Gnash-commit] gnash/libnet rtmp.cpp

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Rob Savoye <rsavoye>    08/06/18 21:56:20

Modified files:
        libnet         : rtmp.cpp 

Log message:
        Only set the bodysize if the header is size 1.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/libnet/rtmp.cpp?cvsroot=gnash&r1=1.13&r2=1.14

Patches:
Index: rtmp.cpp
===================================================================
RCS file: /sources/gnash/gnash/libnet/rtmp.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- rtmp.cpp    17 Jun 2008 14:55:13 -0000      1.13
+++ rtmp.cpp    18 Jun 2008 21:56:20 -0000      1.14
@@ -243,6 +243,10 @@
     _header.head_size = headerSize(*tmpptr++);
     log_debug (_("The header size is %d"), _header.head_size);
 
+    if (_header.head_size == 1) {
+        _header.bodysize = sizeof(boost::uint16_t) * 2;
+    }
+    
     if (_header.head_size >= 4) {
         _mystery_word = *tmpptr++;
         _mystery_word = (_mystery_word << 12) + *tmpptr++;
@@ -261,7 +265,7 @@
 
     if (_header.head_size >= 8) {
         _header.type = *(content_types_e *)tmpptr;
-        _header.bodysize = sizeof(boost::uint16_t) * 2;
+//        _header.bodysize = sizeof(boost::uint16_t) * 2;
         tmpptr++;
         log_debug(_("The type is: %s"), content_str[_header.type]);
     }
@@ -885,6 +889,11 @@
     
 //    Element *el = new Element;  
 //    el.
+    
+    if (rthead->bodysize < ret) {
+       log_debug("more bytes left to read ! %d", (rthead->bodysize < ret));
+    }
+    
     return 0;
 }