From d211da15b29e531a932e97411cf6c461d5c5bc1b Mon Sep 17 00:00:00 2001
From: Denis Kenzior <denkenz@gmail.com>
Date: Wed, 21 Apr 2010 10:14:04 -0500
Subject: [PATCH] stkutil: Refactor remote entity address

Don't assign to the return structure until we know we can successfully
parse.
---
 src/stkutil.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/stkutil.c b/src/stkutil.c
index c0fe4737..54ef806a 100644
--- a/src/stkutil.c
+++ b/src/stkutil.c
@@ -1407,8 +1407,7 @@ static gboolean parse_dataobj_remote_entity_address(
 
 	data = comprehension_tlv_iter_get_data(iter);
 
-	rea->coding_type = data[0];
-	switch (rea->coding_type) {
+	switch (data[0]) {
 	case 0x00:
 		if (len != 7)
 			return FALSE;
@@ -1421,6 +1420,7 @@ static gboolean parse_dataobj_remote_entity_address(
 		return FALSE;
 	}
 
+	rea->coding_type = data[0];
 	memcpy(&rea->addr, data + 1, len - 1);
 
 	return TRUE;