From e4d97f6d7466f1c0bd74785bf5cc450f08c794ba Mon Sep 17 00:00:00 2001 From: John Ralls Date: Thu, 7 Aug 2014 11:46:17 -0700 Subject: [PATCH] Fix test-backend-dbi segfault with libdbi-0.9.0. dbi_inst must be initialized before it can be used. --- src/backend/dbi/test/test-backend-dbi-basic.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/backend/dbi/test/test-backend-dbi-basic.c b/src/backend/dbi/test/test-backend-dbi-basic.c index d7e88ebd80..b3203f0bbe 100644 --- a/src/backend/dbi/test/test-backend-dbi-basic.c +++ b/src/backend/dbi/test/test-backend-dbi-basic.c @@ -36,7 +36,7 @@ #if LIBDBI_VERSION >= 900 #define HAVE_LIBDBI_R 1 -static dbi_inst dbi_instance; +static dbi_inst dbi_instance = NULL; #else #define HAVE_LIBDBI_R 0 #endif @@ -597,8 +597,11 @@ test_suite_gnc_backend_dbi (void) dbi_driver driver = NULL; GList *drivers = NULL; #if HAVE_LIBDBI_R + if (dbi_instance == NULL) + dbi_initialize_r (NULL, &dbi_instance); while ((driver = dbi_driver_list_r (driver, dbi_instance))) #else + dbi_initialize (NULL); while ((driver = dbi_driver_list (driver))) #endif {