diff options
author | Neil Roberts <neil@linux.intel.com> | 2013-06-26 17:07:34 +0100 |
---|---|---|
committer | Neil Roberts <neil@linux.intel.com> | 2013-06-27 14:22:53 +0100 |
commit | 41e233b4b27de579f77b82115cf43a618bf0c93f (patch) | |
tree | 8d8a1ebf0a2324a1396ac264fc200919cec8ade0 | |
parent | 109c815bf747fe027a74f098b4fcb6ea4846a482 (diff) | |
download | cogl-41e233b4b27de579f77b82115cf43a618bf0c93f.tar.gz |
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>
-rw-r--r-- | 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 753e4c82..f72415bd 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 |