[cogl/cogl-1.16] Log a fatal error when an error is propagated to a NULL error argument



commit 7b80ddcef9ddadd868d92e0613a54ed8f506c500
Author: Neil Roberts <neil linux intel com>
Date:   Wed Jun 26 17:07:34 2013 +0100

    Log a fatal error when an error is propagated to a NULL error argument
    
    Unlike in GError, the policy in Cogl for when NULL is passed as the
    CoglError argument is that the program should abort with a fatal
    error. Previously however any errors that were being propagated were
    being silently dropped if the application passed NULL. This patch
    fixes it to also log a fatal error in that case.
    
    Reviewed-by: Robert Bragg <robert linux intel com>
    
    (cherry picked from commit 41e233b4b27de579f77b82115cf43a618bf0c93f)

 cogl/cogl-error.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/cogl/cogl-error.c b/cogl/cogl-error.c
index 753e4c8..f72415b 100644
--- a/cogl/cogl-error.c
+++ b/cogl/cogl-error.c
@@ -105,7 +105,10 @@ _cogl_propagate_error (CoglError **dest,
   _COGL_RETURN_IF_FAIL (src != NULL);
 
   if (dest == NULL)
-    cogl_error_free (src);
+    {
+      g_log (G_LOG_DOMAIN, G_LOG_LEVEL_ERROR, "%s", src->message);
+      cogl_error_free (src);
+    }
   else if (*dest)
     g_warning (ERROR_OVERWRITTEN_WARNING, src->message);
   else


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]