[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_start-60-g147329a

[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  147329a931cd7d80d3b69cf8bfb392b2a88dab6b (commit)
      from  c6a1ceb46ba64f58c549ef25939ba08540315b36 (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=147329a931cd7d80d3b69cf8bfb392b2a88dab6b


commit 147329a931cd7d80d3b69cf8bfb392b2a88dab6b
Author: Bastiaan Jacques <address@hidden>
Date:   Mon Feb 14 14:49:32 2011 +0100

    Make sure the glib-returned error pointer is valid before dereferencing. 
(bug #32445)

diff --git a/plugin/npapi/plugin.cpp b/plugin/npapi/plugin.cpp
index 02a2482..5c4b15d 100644
--- a/plugin/npapi/plugin.cpp
+++ b/plugin/npapi/plugin.cpp
@@ -725,11 +725,12 @@ nsPluginInstance::handlePlayerRequests(GIOChannel* 
iochan, GIOCondition cond)
         switch (status) {
           case G_IO_STATUS_ERROR:
               gnash::log_error("error reading request line: %s",
-                               error->message);
+                               error ? error->message : "unspecified error");
               g_error_free(error);
               return false;
           case G_IO_STATUS_EOF:
-              gnash::log_error("EOF (error: %s", error->message);
+              gnash::log_error("EOF (error: %s)", 
+                               error ? error->message : "unspecified error");
               g_error_free(error);
               return false;
           case G_IO_STATUS_AGAIN:

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

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


hooks/post-receive
-- 
Gnash