From 1c9fcf9a7e8cc57e1d08af03df939ee495fb57cc Mon Sep 17 00:00:00 2001
From: Phil Longstaff <plongstaff@newearth.org>
Date: Sun, 27 Jul 2008 15:11:19 +0000
Subject: [PATCH] Fix more NULL guid reference handling instances.

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/branches/gda-dev2@17420 57a11ea4-9604-0410-9ed3-97b8803252fd
---
 src/business/business-core/sql/gnc-invoice-sql.c   | 2 +-
 src/business/business-core/sql/gnc-order-sql.c     | 2 +-
 src/business/business-core/sql/gnc-tax-table-sql.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/business/business-core/sql/gnc-invoice-sql.c b/src/business/business-core/sql/gnc-invoice-sql.c
index 6068e8ca29..d4a6860393 100644
--- a/src/business/business-core/sql/gnc-invoice-sql.c
+++ b/src/business/business-core/sql/gnc-invoice-sql.c
@@ -245,7 +245,7 @@ load_invoice_guid( const GncSqlBackend* be, GncSqlRow* row,
 	g_return_if_fail( table_row != NULL );
 
     val = gnc_sql_row_get_value_at_col_name( row, table_row->col_name );
-    if( val == NULL ) {
+    if( val == NULL || !G_VALUE_HOLDS_STRING( val ) || g_value_get_string( val ) == NULL ) {
         pGuid = NULL;
     } else {
         string_to_guid( g_value_get_string( val ), &guid );
diff --git a/src/business/business-core/sql/gnc-order-sql.c b/src/business/business-core/sql/gnc-order-sql.c
index ef09c3693e..af25b1b9de 100644
--- a/src/business/business-core/sql/gnc-order-sql.c
+++ b/src/business/business-core/sql/gnc-order-sql.c
@@ -201,7 +201,7 @@ load_order_guid( const GncSqlBackend* be, GncSqlRow* row,
 	g_return_if_fail( table_row != NULL );
 
     val = gnc_sql_row_get_value_at_col_name( row, table_row->col_name );
-    if( val == NULL ) {
+    if( val == NULL || !G_VALUE_HOLDS_STRING( val ) || g_value_get_string( val ) == NULL ) {
         pGuid = NULL;
     } else {
         string_to_guid( g_value_get_string( val ), &guid );
diff --git a/src/business/business-core/sql/gnc-tax-table-sql.c b/src/business/business-core/sql/gnc-tax-table-sql.c
index 7ab6fa2041..d3a34c0b07 100644
--- a/src/business/business-core/sql/gnc-tax-table-sql.c
+++ b/src/business/business-core/sql/gnc-tax-table-sql.c
@@ -369,7 +369,7 @@ load_taxtable_guid( const GncSqlBackend* be, GncSqlRow* row,
 	g_return_if_fail( table_row != NULL );
 
     val = gnc_sql_row_get_value_at_col_name( row, table_row->col_name );
-    if( val == NULL ) {
+    if( val == NULL || !G_VALUE_HOLDS_STRING( val ) || g_value_get_string( val ) == NULL ) {
         pGuid = NULL;
     } else {
         string_to_guid( g_value_get_string( val ), &guid );