[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-1971-g41590ec

[Petter Reinholdtsen]

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  41590ecb73f8d798d09b45aad9d97d4149213d01 (commit)
      from  9fc95e8690f0027d9ed8cb702ab4a493d2ded7f6 (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=41590ecb73f8d798d09b45aad9d97d4149213d01


commit 41590ecb73f8d798d09b45aad9d97d4149213d01
Author: Petter Reinholdtsen <address@hidden>
Date:   Tue May 6 09:43:12 2014 +0200

    Make sure to check return value from ioctl(fd,  FIONREAD, &bytes) and
    report an error if it fail (Coverity CID 1211833).

diff --git a/plugin/npapi/pluginScriptObject.cpp 
b/plugin/npapi/pluginScriptObject.cpp
index 538427e..caa58fc 100644
--- a/plugin/npapi/pluginScriptObject.cpp
+++ b/plugin/npapi/pluginScriptObject.cpp
@@ -711,11 +711,14 @@ GnashPluginScriptObject::readPlayer(int fd)
     }
 
 #ifndef _WIN32
-    ioctl(fd, FIONREAD, &bytes);
+    rv = ioctl(fd, FIONREAD, &bytes);
 #else
-    ioctlSocket(fd, FIONREAD, &bytes);
+    rv = ioctlSocket(fd, FIONREAD, &bytes);
 #endif
-
+    if (rv < 0) {
+        log_error("FIONREAD ioctl failed, unable to get network buffer 
length");
+        return empty;
+    }
     log_debug("There are %d bytes in the network buffer", bytes);
 
     if (bytes <= 0) {

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

Summary of changes:
 plugin/npapi/pluginScriptObject.cpp |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
Gnash