[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-1941-g42895e7

[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  42895e7a94c4425f70e03d6b712543144a9c2a7c (commit)
       via  88b33c1f8e08dc1edf81aae2cb00f0899f5912b6 (commit)
       via  a9b838f9bf655ac4b204c69e4988a99196ccc28b (commit)
      from  1c10aa687b0ca270d292bba5f00a83525285186f (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=42895e7a94c4425f70e03d6b712543144a9c2a7c


commit 42895e7a94c4425f70e03d6b712543144a9c2a7c
Author: Petter Reinholdtsen <address@hidden>
Date:   Fri Apr 25 00:02:21 2014 +0200

    Initialize the rest of the member variables in the DumpGui::DumpGui()
    constructor (Coverity CID 1149267).

diff --git a/gui/dump/dump.cpp b/gui/dump/dump.cpp
index f612991..0ce5e68 100644
--- a/gui/dump/dump.cpp
+++ b/gui/dump/dump.cpp
@@ -91,8 +91,10 @@ DumpGui::DumpGui(unsigned long xid, float scale, bool loop, 
RunResources& r)
     _pixelformat("BGRA32"),
     _fileOutput(),
     _fileOutputFPS(0), // dump at every heart-beat by default
+    _fileOutputAdvance(0),
     _lastVideoFrameDump(0), // this will be computed
     _sleepUS(0),
+    _videoDumpFPS(0),
     _started(false),
     _startTime(0)
 {

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


commit 88b33c1f8e08dc1edf81aae2cb00f0899f5912b6
Author: Petter Reinholdtsen <address@hidden>
Date:   Thu Apr 24 23:54:39 2014 +0200

    Do not try to print what can be a NULL pointer
    (Coverity CID 1149175 and 1149174).

diff --git a/gui/fb/fb.cpp b/gui/fb/fb.cpp
index cdbeef5..af05358 100644
--- a/gui/fb/fb.cpp
+++ b/gui/fb/fb.cpp
@@ -563,19 +563,17 @@ FBGui::disable_terminal()
     
     char* tty = find_accessible_tty(0);
 
-    log_debug("Disabling terminal %s", tty);
-    
-    int fd;
-  
     if (!tty) {
-        log_error(_("Could not detect controlling TTY"));
+        log_error(_("Could not detect controlling TTY when trying to disable 
terminal"));
         return false;
     }
     
+    log_debug("Disabling terminal %s", tty);
+    
     // Detect the currently active virtual terminal (so we can switch back to
     // it later)
     
-    fd = open(tty, O_RDWR);
+    int fd = open(tty, O_RDWR);
     if (fd < 0) {
         log_error(_("Could not open %s"), tty);
         return false;
@@ -694,13 +692,14 @@ FBGui::enable_terminal()
     // log_debug("Restoring terminal...");
 
     char* tty = find_accessible_tty(_own_vt);
-    log_debug("Enabling terminal %s", tty);
 
     if (!tty) {
-        log_error(_("Could not find device for VT number %d"), _own_vt);
+        log_error(_("Could not find device for VT number %d when enabling 
terminal"), _own_vt);
         return false;
     }
 
+    log_debug("Enabling terminal %s", tty);
+
     int fd = open(tty, O_RDWR);
     if (fd < 0) {
         log_error(_("Could not open %s"), tty);

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


commit a9b838f9bf655ac4b204c69e4988a99196ccc28b
Author: Petter Reinholdtsen <address@hidden>
Date:   Thu Apr 24 23:52:02 2014 +0200

    Make sure to initialize FBAggGlue member variables fb_var_screeninfo and 
fb_fix_screeninfo in the other constructor too (Coverity CID 1149298).

diff --git a/gui/fb/fb_glue_agg.cpp b/gui/fb/fb_glue_agg.cpp
index 6fb60fd..c9e2d1c 100644
--- a/gui/fb/fb_glue_agg.cpp
+++ b/gui/fb/fb_glue_agg.cpp
@@ -55,6 +55,8 @@ FBAggGlue::FBAggGlue(int fd)
     : _fd(fd)
 {
 //    GNASH_REPORT_FUNCTION;    
+    memset(&_varinfo, 0, sizeof(fb_var_screeninfo));
+    memset(&_fixinfo, 0, sizeof(fb_fix_screeninfo));
 }
 
 FBAggGlue::~FBAggGlue()

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

Summary of changes:
 gui/dump/dump.cpp      |    2 ++
 gui/fb/fb.cpp          |   15 +++++++--------
 gui/fb/fb_glue_agg.cpp |    2 ++
 3 files changed, 11 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
Gnash