From 876bfd19ad2c7d80d8dae008241c9ef67f1655a2 Mon Sep 17 00:00:00 2001 From: John Ralls Date: Wed, 28 Nov 2018 16:18:34 +0900 Subject: [PATCH] Protect against nullptr dereference, remove unused GError. Found by clang static analyzer. --- libgnucash/backend/xml/io-gncxml-v2.cpp | 5 +---- libgnucash/backend/xml/io-utils.cpp | 2 ++ 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/libgnucash/backend/xml/io-gncxml-v2.cpp b/libgnucash/backend/xml/io-gncxml-v2.cpp index 3c04094076..3b2c0b35f5 100644 --- a/libgnucash/backend/xml/io-gncxml-v2.cpp +++ b/libgnucash/backend/xml/io-gncxml-v2.cpp @@ -1539,7 +1539,6 @@ try_gz_open (const char* filename, const char* perms, gboolean use_gzip, { int filedes[2]; GThread* thread; - GError* error = NULL; gz_thread_params_t* params; FILE* file; @@ -1564,9 +1563,7 @@ try_gz_open (const char* filename, const char* perms, gboolean use_gzip, params); if (!thread) { - g_warning ("Could not create thread for (de)compression: %s", - error->message); - g_error_free (error); + g_warning ("Could not create thread for (de)compression."); g_free (params->filename); g_free (params->perms); g_free (params); diff --git a/libgnucash/backend/xml/io-utils.cpp b/libgnucash/backend/xml/io-utils.cpp index 733956f5bc..c2d033e382 100644 --- a/libgnucash/backend/xml/io-utils.cpp +++ b/libgnucash/backend/xml/io-utils.cpp @@ -65,6 +65,8 @@ write_one_account (FILE* out, xmlElemDump (out, NULL, accnode); xmlFreeNode (accnode); + g_return_val_if_fail(gd, FALSE); + if (ferror (out) || fprintf (out, "\n") < 0) return FALSE;