Make the array for the "setup method" for RTP, RTCP, and T.38

conversations large enough to hold the maximum setup method size plus a
trailing '\0'.  Make the maximum setup method size 7, so that when the
trailing '\0' is included the total array length is a power of 2.  (The
longest string currently used is "Skinny", which fits in 7 characters).

This fixes problems in the RTP and RTCP dissectors similar to the one
found in the T.38 dissector.

Undo the previous change to packet-t38.c, as it's now safe to store in
method[MAX_T38_SETUP_METHOD_SIZE], because the array now has
MAX_T38_SETUP_METHOD_SIZE+1 characters.

(Should we use "strlcpy()", and supply our own "strlcpy()" if the system
and/or C library doesn't supply it?  Its semantics are a bit cleaner
than those of the "strncpy()"/null-terminate idiom, perhaps making it
less likely that mistakes of this sort will be made.)

svn path=/trunk/; revision=12803

1 files changed, 1 insertions, 1 deletions

diff --git a/epan/dissectors/packet-t38.c b/epan/dissectors/packet-t38.c
index 06327f5ce1..b7d05daa2a 100644
--- a/epan/dissectors/packet-t38.c
+++ b/epan/dissectors/packet-t38.c
@@ -233,7 +233,7 @@ void t38_add_address(packet_info *pinfo,
          * Update the conversation data.
          */
         strncpy(p_conv_data->method, setup_method, MAX_T38_SETUP_METHOD_SIZE);
-        p_conv_data->method[MAX_T38_SETUP_METHOD_SIZE - 1] = '\0';
+        p_conv_data->method[MAX_T38_SETUP_METHOD_SIZE] = '\0';
         p_conv_data->frame_number = setup_frame_number;
 }