Add a few tvb_ensure_bytes_exist() calls.

svn path=/trunk/; revision=14174

1 files changed, 5 insertions, 0 deletions

diff --git a/epan/dissectors/packet-dcerpc-epm.c b/epan/dissectors/packet-dcerpc-epm.c
index 75c6deb70e..fb97716e3c 100644
--- a/epan/dissectors/packet-dcerpc-epm.c
+++ b/epan/dissectors/packet-dcerpc-epm.c
@@ -190,6 +190,7 @@ epm_dissect_ept_entry_t(tvbuff_t *tvb, int offset,
     str=(const char *)tvb_get_ptr(tvb, offset, -1);
     strlen=len;
     strlen=MIN(strlen,tvb_length_remaining(tvb, offset));
+    tvb_ensure_bytes_exist(tvb, offset, len);
     proto_tree_add_item(tree, hf_epm_annotation, tvb, offset, len, TRUE);
     offset += len;
 
@@ -408,16 +409,19 @@ epm_dissect_tower_data (tvbuff_t *tvb, int offset,
 	    break;
 
         case PROTO_ID_NAMED_PIPES: /* \\PIPE\xxx   named pipe */
+	    tvb_ensure_bytes_exist(tvb, offset, len);
             proto_tree_add_item(tr, hf_epm_proto_named_pipes, tvb, offset, len, TRUE);
             proto_item_append_text(tr, "NamedPipe:%*s",MIN(len,tvb_length_remaining(tvb, offset)), tvb_get_ptr(tvb, offset, -1)); 
             break;
 
         case PROTO_ID_NAMED_PIPES_2: /* PIPENAME  named pipe */
+	    tvb_ensure_bytes_exist(tvb, offset, len);
             proto_tree_add_item(tr, hf_epm_proto_named_pipes, tvb, offset, len, TRUE);
             proto_item_append_text(tr, "PIPE:%*s",MIN(len,tvb_length_remaining(tvb, offset)), tvb_get_ptr(tvb, offset, -1)); 
             break;
 
         case PROTO_ID_NETBIOS: /* \\NETBIOS   netbios name */
+	    tvb_ensure_bytes_exist(tvb, offset, len);
             proto_tree_add_item(tr, hf_epm_proto_netbios_name, tvb, offset, len, TRUE);
             proto_item_append_text(tr, "NetBIOS:%*s",MIN(len,tvb_length_remaining(tvb, offset)), tvb_get_ptr(tvb, offset, -1)); 
             break;
@@ -428,6 +432,7 @@ epm_dissect_tower_data (tvbuff_t *tvb, int offset,
 			
         default:
             if(len){
+		tvb_ensure_bytes_exist(tvb, offset, len);
                 proto_tree_add_text(tr, tvb, offset, len, "not decoded yet");
             }
         }