From c6e7b134a84881404ae3cb03e74294ede2b39b36 Mon Sep 17 00:00:00 2001
From: Dave Peticolas <dave@krondo.com>
Date: Sat, 15 Apr 2000 07:27:31 +0000
Subject: [PATCH] *** empty log message ***

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@2187 57a11ea4-9604-0410-9ed3-97b8803252fd
---
 src/engine/Transaction.c | 15 ++++++---------
 src/engine/guid/guid.c   |  7 +++++--
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/engine/Transaction.c b/src/engine/Transaction.c
index c092958a7e..0dd2e10808 100644
--- a/src/engine/Transaction.c
+++ b/src/engine/Transaction.c
@@ -759,25 +759,22 @@ FindCommonCurrency (Split **slist, char * ra, char * rb)
 char *
 xaccTransFindCommonCurrency (Transaction *trans)
 {
-  char *ra, *rb, *com;
+  char *ra, *rb;
 
-  assert (trans->splits);
-  assert (trans->splits[0]);
-  assert (trans->splits[0]->acc);
+  if (trans->splits == NULL) return NULL;
+  if (trans->splits[0] == NULL) return NULL;
+  if (trans->splits[0]->acc == NULL) return NULL;
 
   ra = trans->splits[0]->acc->currency;
   rb = trans->splits[0]->acc->security;
 
-  com = FindCommonCurrency (trans->splits, ra, rb);
-  return com;
+  return FindCommonCurrency (trans->splits, ra, rb);
 }
 
 char *
 xaccTransIsCommonCurrency (Transaction *trans, char * ra)
 {
-  char *com;
-  com = FindCommonCurrency (trans->splits, ra, NULL);
-  return com;
+  return FindCommonCurrency (trans->splits, ra, NULL);
 }
 
 /********************************************************************\
diff --git a/src/engine/guid/guid.c b/src/engine/guid/guid.c
index 3f788df008..ed2e5151c9 100644
--- a/src/engine/guid/guid.c
+++ b/src/engine/guid/guid.c
@@ -289,8 +289,11 @@ guid_init()
     char *s;
 
     s = getlogin();
-    md5_process_bytes(s, strlen(s), &guid_context);
-    bytes += strlen(s);
+    if (s != NULL)
+    {
+      md5_process_bytes(s, strlen(s), &guid_context);
+      bytes += strlen(s);
+    }
 
     uid = getuid();
     md5_process_bytes(&uid, sizeof(uid), &guid_context);