[Gnash-commit] /srv/bzr/gnash/trunk r9602: Properly handle meta data tags without the leading type field.

[rob]

------------------------------------------------------------
revno: 9602
committer: address@hidden
branch nick: trunk
timestamp: Fri 2008-08-15 13:17:28 -0600
message:
  Properly handle meta data tags without the leading type field.
modified:
  libamf/flv.cpp

=== modified file 'libamf/flv.cpp'
--- a/libamf/flv.cpp    2008-08-14 02:00:36 +0000
+++ b/libamf/flv.cpp    2008-08-15 19:17:28 +0000
@@ -149,13 +149,14 @@
     // Gnash's libmedia/FLVParser code. So if we see the begining
     // of "onMetaData", then just grab the length without the type
     // field.
-    if ((*ptr == 0) && (*ptr+3 == 'o')) {
+    if ((*ptr == 0) && (*(ptr+2) == 'o')) {
        boost::uint16_t length;
        length = ntohs((*(boost::uint16_t *)ptr) & 0xffff);
        name = new char(length+1);
        memset(name, 0, length+1);
+       ptr += sizeof(boost::uint16_t);
        std::copy(name, name + length, ptr);
-       ptr += length + AMF_HEADER_SIZE;
+       ptr += length;
     } else {   
        Element *objname = amf.extractAMF(ptr, tooFar);
        if (objname == 0) {