[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-1726-gabd87b5

[Bastiaan Jacques]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, master has been updated
       via  abd87b5eedc02ceed480c6fb656439174878ad4a (commit)
       via  97cf7647ac9cc94568b00854da78056bb5aa4924 (commit)
       via  661f72a2127bde6273c6fc0bb3ab2b718bc0870b (commit)
       via  f149ea15e0aa8a540b5ac9b40bc6aade8de9b453 (commit)
       via  09a0637a885aa9845694a28c716b3382db9c6eca (commit)
       via  cab7aaf77cd457eeb1720896e977e556cb97042c (commit)
      from  2b2dc59b2b9a7cfad46c4ca79f8d03fe0ee8bac0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=abd87b5eedc02ceed480c6fb656439174878ad4a


commit abd87b5eedc02ceed480c6fb656439174878ad4a
Author: Bastiaan Jacques <address@hidden>
Date:   Sat Aug 10 11:56:19 2013 +0200

    empty().

diff --git a/libcore/movie_root.cpp b/libcore/movie_root.cpp
index 75ae7eb..1bae796 100644
--- a/libcore/movie_root.cpp
+++ b/libcore/movie_root.cpp
@@ -1695,7 +1695,7 @@ movie_root::executeTimers()
 
     // Don't do anything if we have no timers, just return so we don't
     // waste cpu cycles.
-    if (_intervalTimers.size() == 0) {
+    if (_intervalTimers.empty()) {
         return;
     }
 

http://git.savannah.gnu.org/cgit//commit/?id=97cf7647ac9cc94568b00854da78056bb5aa4924


commit 97cf7647ac9cc94568b00854da78056bb5aa4924
Author: Bastiaan Jacques <address@hidden>
Date:   Sat Aug 10 11:55:55 2013 +0200

    Avoid reading past the end of codeMap.

diff --git a/libcore/event_id.h b/libcore/event_id.h
index 5eb6ab1..6890be5 100644
--- a/libcore/event_id.h
+++ b/libcore/event_id.h
@@ -118,7 +118,7 @@ public:
         // As long as we can work out the SWFCode from the
         // gnash::key::code it's all right.
         int i = 0;
-        while (key::codeMap[i][key::SWF] != SWFkey && i < key::KEYCOUNT) i++;
+        while (i < key::KEYCOUNT && key::codeMap[i][key::SWF] != SWFkey) i++;
 
         if (i == key::KEYCOUNT) _keyCode = key::INVALID;
         else _keyCode = static_cast<key::code>(i);

http://git.savannah.gnu.org/cgit//commit/?id=661f72a2127bde6273c6fc0bb3ab2b718bc0870b


commit 661f72a2127bde6273c6fc0bb3ab2b718bc0870b
Author: Bastiaan Jacques <address@hidden>
Date:   Sat Aug 10 11:55:25 2013 +0200

    Don't bother modifying a local variable that's not returned.

diff --git a/libbase/RTMP.cpp b/libbase/RTMP.cpp
index f02c91c..cc5046f 100644
--- a/libbase/RTMP.cpp
+++ b/libbase/RTMP.cpp
@@ -382,8 +382,6 @@ RTMP::readSocket(boost::uint8_t* buffer, int n)
         sendBytesReceived(this);
         log_debug("Sent bytes received");
     }
-
-    buffer += bytesRead;
     return bytesRead;
 }
 

http://git.savannah.gnu.org/cgit//commit/?id=f149ea15e0aa8a540b5ac9b40bc6aade8de9b453


commit f149ea15e0aa8a540b5ac9b40bc6aade8de9b453
Author: Bastiaan Jacques <address@hidden>
Date:   Sat Aug 10 11:55:08 2013 +0200

    Prefix instead of postfix.

diff --git a/libbase/utf8.cpp b/libbase/utf8.cpp
index bcf3d9f..31f3c8e 100644
--- a/libbase/utf8.cpp
+++ b/libbase/utf8.cpp
@@ -344,8 +344,8 @@ guessEncoding(const std::string &str, int &length, 
std::vector<int>& offsets)
             was_even = !was_odd;
         }
     
-        it++;
-        index++;    
+        ++it;
+        ++index;    
     }
     offsets.push_back(index); // [length - 1] = index;
     

http://git.savannah.gnu.org/cgit//commit/?id=09a0637a885aa9845694a28c716b3382db9c6eca


commit 09a0637a885aa9845694a28c716b3382db9c6eca
Author: Bastiaan Jacques <address@hidden>
Date:   Sat Aug 10 11:54:44 2013 +0200

    Avoid NULL dereference and assorted cleanups.

diff --git a/libbase/Socket.cpp b/libbase/Socket.cpp
index 39bc7fc..402467e 100644
--- a/libbase/Socket.cpp
+++ b/libbase/Socket.cpp
@@ -188,6 +188,12 @@ Socket::connect(const std::string& hostname, 
boost::uint16_t port)
         }
     }
 
+    if (!it) {
+        log_error(_("Socket creation attempt(s) failed: giving up."));
+        freeaddrinfo(ans);
+        return false;
+    }
+
 #ifndef _WIN32
     // Set non-blocking.
     const int flag = ::fcntl(_socket, F_GETFL, 0);
@@ -234,18 +240,10 @@ Socket::connect(const std::string& hostname, 
boost::uint16_t port)
 void
 Socket::fillCache()
 {
-
     // Read position is always _pos + _size wrapped.
     const size_t cacheSize = arraySize(_cache);
     size_t start = (_pos + _size) % cacheSize;
 
-    // Try to fill the whole remaining buffer.
-    const size_t completeRead = cacheSize - _size;
-    
-    // End is start + read size, wrapped.
-    size_t end = (start + completeRead) % cacheSize;
-    if (end == 0) end = cacheSize;
-
     char* startpos = _cache + start;
 
     while (1) {
@@ -345,8 +343,6 @@ std::streamsize
 Socket::write(const void* src, std::streamsize num)
 {
     if (bad()) return 0;
-
-    int bytesSent = 0;
     int toWrite = num;
 
     const char* buf = static_cast<const char*>(src);
@@ -368,7 +364,7 @@ Socket::write(const void* src, std::streamsize num)
     // a return of -1 from ::send.
 
     while (toWrite > 0) {
-        bytesSent = ::send(_socket, buf, toWrite, 0);
+        int bytesSent = ::send(_socket, buf, toWrite, 0);
         if (bytesSent < 0) {
             const int err = errno;
             log_error(_("Socket send error %s"), std::strerror(err));

http://git.savannah.gnu.org/cgit//commit/?id=cab7aaf77cd457eeb1720896e977e556cb97042c


commit cab7aaf77cd457eeb1720896e977e556cb97042c
Author: Bastiaan Jacques <address@hidden>
Date:   Sat Aug 10 11:54:36 2013 +0200

    Const.

diff --git a/libbase/BitsReader.h b/libbase/BitsReader.h
index 180a5c8..83c3391 100644
--- a/libbase/BitsReader.h
+++ b/libbase/BitsReader.h
@@ -155,7 +155,7 @@ public:
        }
 
        /// Checks if the stream contains X bits
-       bool gotBits(boost::uint32_t nbits)
+       bool gotBits(boost::uint32_t nbits) const
        {
                boost::uint32_t gotbits = 8-usedBits +8*(end-ptr-1);
                if (gotbits > nbits) return true;

-----------------------------------------------------------------------

Summary of changes:
 libbase/BitsReader.h   |    2 +-
 libbase/RTMP.cpp       |    2 --
 libbase/Socket.cpp     |   18 +++++++-----------
 libbase/utf8.cpp       |    4 ++--
 libcore/event_id.h     |    2 +-
 libcore/movie_root.cpp |    2 +-
 6 files changed, 12 insertions(+), 18 deletions(-)


hooks/post-receive
-- 
Gnash