Replace ep_address_to_str with address_to_str.

Change-Id: I4f1078b20f41800f72a751612703ad0d4c2ae87b
Reviewed-on: https://code.wireshark.org/review/6323
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

1 files changed, 25 insertions, 10 deletions

diff --git a/ui/gtk/sctp_stat_dlg.c b/ui/gtk/sctp_stat_dlg.c
index 26c0daf8a3..8adf75cb56 100644
--- a/ui/gtk/sctp_stat_dlg.c
+++ b/ui/gtk/sctp_stat_dlg.c
@@ -458,67 +458,82 @@ sctp_stat_on_filter(GtkButton *button _U_, gpointer user_data _U_)
 		struct sockaddr_in *infosrc;
 		struct sockaddr_in *infodst;
 		address addr;
+		char    *addr_str;
 
 		srclist = g_list_first(selected_stream->addr1);
 		infosrc = (struct sockaddr_in *)(srclist->data);
 		SET_ADDRESS(&addr, AT_IPv4, 4, &(infosrc->sin_addr.s_addr));
+		addr_str = (char*)address_to_str(NULL, &addr);
 		gstring = g_string_new(g_strdup_printf("((sctp.srcport==%u && sctp.dstport==%u && (ip.src==%s",
-			selected_stream->port1, selected_stream->port2,
-			ep_address_to_str(&addr)));
+			selected_stream->port1, selected_stream->port2, addr_str));
 		srclist= g_list_next(srclist);
+		wmem_free(NULL, addr_str);
 
 		while (srclist)
 		{
 			infosrc = (struct sockaddr_in *)(srclist->data);
 			SET_ADDRESS(&addr, AT_IPv4, 4, &(infosrc->sin_addr.s_addr));
-			str = g_strdup_printf("|| ip.src==%s", ep_address_to_str(&addr));
+			addr_str = (char*)address_to_str(NULL, &addr);
+			str = g_strdup_printf("|| ip.src==%s", addr_str);
 			g_string_append(gstring, str);
+			wmem_free(NULL, addr_str);
 			srclist = g_list_next(srclist);
 		}
 		dstlist = g_list_first(selected_stream->addr2);
 		infodst = (struct sockaddr_in *)(dstlist->data);
 		SET_ADDRESS(&addr, AT_IPv4, 4, &(infodst->sin_addr.s_addr));
-		str = g_strdup_printf(") && (ip.dst==%s", ep_address_to_str(&addr));
+		addr_str = (char*)address_to_str(NULL, &addr);
+		str = g_strdup_printf(") && (ip.dst==%s", addr_str);
 		g_string_append(gstring, str);
+		wmem_free(NULL, addr_str);
 		dstlist = g_list_next(dstlist);
 		while (dstlist)
 		{
 			infodst = (struct sockaddr_in *)(dstlist->data);
 			SET_ADDRESS(&addr, AT_IPv4, 4, &(infodst->sin_addr.s_addr));
-			str = g_strdup_printf("|| ip.dst==%s", ep_address_to_str(&addr));
+			addr_str = (char*)address_to_str(NULL, &addr);
+			str = g_strdup_printf("|| ip.dst==%s", addr_str);
 			g_string_append(gstring, str);
+			wmem_free(NULL, addr_str);
 			dstlist = g_list_next(dstlist);
 		}
 		srclist = g_list_first(selected_stream->addr1);
 		infosrc = (struct sockaddr_in *)(srclist->data);
 		SET_ADDRESS(&addr, AT_IPv4, 4, &(infosrc->sin_addr.s_addr));
+		addr_str = (char*)address_to_str(NULL, &addr);
 		str = g_strdup_printf(")) || (sctp.dstport==%u && sctp.srcport==%u && (ip.dst==%s",
-			selected_stream->port1, selected_stream->port2,
-			ep_address_to_str(&addr));
+			selected_stream->port1, selected_stream->port2, addr_str);
 		g_string_append(gstring, str);
+		wmem_free(NULL, addr_str);
 		srclist = g_list_next(srclist);
 
 		while (srclist)
 		{
 			infosrc = (struct sockaddr_in *)(srclist->data);
 			SET_ADDRESS(&addr, AT_IPv4, 4, &(infosrc->sin_addr.s_addr));
-			str = g_strdup_printf("|| ip.dst==%s", ep_address_to_str(&addr));
+			addr_str = (char*)address_to_str(NULL, &addr);
+			str = g_strdup_printf("|| ip.dst==%s", addr_str);
 			g_string_append(gstring, str);
+			wmem_free(NULL, addr_str);
 			srclist= g_list_next(srclist);
 		}
 
 		dstlist = g_list_first(selected_stream->addr2);
 		infodst = (struct sockaddr_in *)(dstlist->data);
 		SET_ADDRESS(&addr, AT_IPv4, 4, &(infodst->sin_addr.s_addr));
-		str = g_strdup_printf(") && (ip.src==%s", ep_address_to_str(&addr));
+		addr_str = (char*)address_to_str(NULL, &addr);
+		str = g_strdup_printf(") && (ip.src==%s", addr_str);
 		g_string_append(gstring, str);
+		wmem_free(NULL, addr_str);
 		dstlist = g_list_next(dstlist);
 		while (dstlist)
 		{
 			infodst = (struct sockaddr_in *)(dstlist->data);
 			SET_ADDRESS(&addr, AT_IPv4, 4, &(infodst->sin_addr.s_addr));
-			str = g_strdup_printf("|| ip.src==%s", ep_address_to_str(&addr));
+			addr_str = (char*)address_to_str(NULL, &addr);
+			str = g_strdup_printf("|| ip.src==%s", addr_str);
 			g_string_append(gstring, str);
+			wmem_free(NULL, addr_str);
 			dstlist = g_list_next(dstlist);
 		}
 		str = g_strdup_printf(")))");