fix coverity CIDs 113 and 114.

while at it change the h248 context analysis to use se_trees instead of GHashTables


svn path=/trunk/; revision=17571

1 files changed, 18 insertions, 12 deletions

diff --git a/asn1/h248/h248.cnf b/asn1/h248/h248.cnf
index bd561c7d9a..a6aee5dd28 100644
--- a/asn1/h248/h248.cnf
+++ b/asn1/h248/h248.cnf
@@ -268,18 +268,24 @@ ServiceChangeReply/terminationID			terminationIDList
 	tvbuff_t* new_tvb;
 	offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, &new_tvb);
 	
-    term->len = tvb_length(new_tvb);
-    term->type = 0; /* unknown */
-
-    if (term->len) {
-        term->buffer = ep_tvb_memdup(new_tvb,0,term->len);
-        term->str = bytes_to_str(term->buffer,term->len);
-    }
-
-    term = h248_cmd_add_term(msg, trx, cmd, term, wild_term);
-
-	if (new_tvb && h248_term_handle) {
-		call_dissector(h248_term_handle, new_tvb, pinfo, tree);
+	if (new_tvb) {
+		term->len = tvb_length(new_tvb);
+		term->type = 0; /* unknown */
+
+		if (term->len) {
+			term->buffer = ep_tvb_memdup(new_tvb,0,term->len);
+			term->str = bytes_to_str(term->buffer,term->len);
+		}
+
+		term = h248_cmd_add_term(msg, trx, cmd, term, wild_term);
+
+		if (h248_term_handle) {
+			call_dissector(h248_term_handle, new_tvb, pinfo, tree);
+		}
+	} else {
+		term->len = 0;
+		term->buffer = (guint8*)ep_strdup("");
+		term->str = ep_strdup("?");
 	}
 #.END