[Gnash-commit] /srv/bzr/gnash/trunk r10380: Fix bug #24998.

[Benjamin Wolsey]

------------------------------------------------------------
revno: 10380
committer: Benjamin Wolsey <address@hidden>
branch nick: trunk
timestamp: Wed 2008-12-03 15:16:21 +0100
message:
  Fix bug #24998.
modified:
  libcore/MovieClip.cpp
  libcore/vm/ASHandlers.cpp
    ------------------------------------------------------------
    revno: 10379.1.1
    committer: Benjamin Wolsey <address@hidden>
    branch nick: work
    timestamp: Wed 2008-12-03 15:04:11 +0100
    message:
      Log once for blendMode unimplemented.
      
      Read string length as uint in ActionPushData, fixing bug #24998. 
    modified:
      libcore/MovieClip.cpp
      libcore/vm/ASHandlers.cpp

=== modified file 'libcore/MovieClip.cpp'
--- a/libcore/MovieClip.cpp     2008-12-03 08:54:10 +0000
+++ b/libcore/MovieClip.cpp     2008-12-03 14:04:11 +0000
@@ -3092,7 +3092,7 @@
     boost::intrusive_ptr<MovieClip> movieclip =
         ensureType<MovieClip>(fn.this_ptr);
     UNUSED(movieclip);
-    log_unimpl(_("MovieClip.blendMode()"));
+    LOG_ONCE(log_unimpl(_("MovieClip.blendMode()")));
     return as_value();
 }
 

=== modified file 'libcore/vm/ASHandlers.cpp'
--- a/libcore/vm/ASHandlers.cpp 2008-11-25 10:07:37 +0000
+++ b/libcore/vm/ASHandlers.cpp 2008-12-03 14:04:11 +0000
@@ -1996,13 +1996,12 @@
     const action_buffer& code = thread.code;
 
     size_t pc = thread.getCurrentPC();
-    boost::int16_t length = code.read_int16(pc+1);
-    assert( length >= 0 ); // TODO: trigger this with a testcase !
+    boost::uint16_t length = code.read_uint16(pc+1);
 
     //---------------
     size_t i = pc;
     size_t count = 0;
-    while (i - pc < static_cast<size_t>(length)) {
+    while (i - pc < length) {
         int id=0; // for dict (constant pool) lookup
                   // declared here because also used
               // by verbose action output