Fix pointer error.

diff --git a/common/tr_rp.c b/common/tr_rp.c
index c3a7b3b..4d87dbc 100644 (file)
--- a/common/tr_rp.c
+++ b/common/tr_rp.c
@@ -125,7 +125,11 @@ TR_RP_REALM *tr_rp_realm_lookup(TR_RP_REALM *rp_realms, TR_NAME *rp_name)
 {
   TR_RP_REALM *rp = NULL;
 
+<<<<<<< HEAD
+  if (!rp_name) {
+=======
   if ((!rp_realms) || (!rp_name)) {
+>>>>>>> 09d2f44c757b9ffc2f38a28bdf212c61f67dabd8
     tr_debug("tr_rp_realm_lookup: Bad parameters.");
     return NULL;
   }
@@ -169,7 +173,10 @@ void tr_rp_realm_free(TR_RP_REALM *rp)
 
 static TR_RP_REALM *tr_rp_realm_tail(TR_RP_REALM *realm)
 {
-  while (realm!=NULL)
+  if (realm==NULL)
+    return NULL;
+
+  while (realm->next!=NULL)
     realm=realm->next;
   return realm;
 }