aboutsummaryrefslogtreecommitdiffstats
path: root/ui/gtk
diff options
context:
space:
mode:
authorPeter Wu <peter@lekensteyn.nl>2014-04-15 19:07:47 +0200
committerMichael Mann <mmann78@netscape.net>2014-04-15 19:07:33 +0000
commitb4442b875cc5ceec5f67b6b01d6d9292ec35a498 (patch)
treea5e449bc2acab4a96eba9a5aea1f2ef43097b356 /ui/gtk
parent3f0bc55ed0e42919dfb05dbdb4d03e03d81ee4d1 (diff)
ui/gtk/voip_calls: Fix minor memleak
Return values from g_strsplit must be always be freed. Also remove a useless return statement and set a saner maximum split. Change-Id: I680e20d40fe86103b0dcba210ef41aa5769f4f86 Reviewed-on: https://code.wireshark.org/review/1155 Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'ui/gtk')
-rw-r--r--ui/gtk/voip_calls.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/ui/gtk/voip_calls.c b/ui/gtk/voip_calls.c
index 24b1af179e..ea150c3a87 100644
--- a/ui/gtk/voip_calls.c
+++ b/ui/gtk/voip_calls.c
@@ -2340,19 +2340,15 @@ static void mgcpCallerID(gchar *signalStr, gchar **callerId)
/* if there is no signalStr, just return false */
if (signalStr == NULL) return;
- arrayStr = g_strsplit(signalStr, "\"", 10);
-
- if (arrayStr[0] == NULL) return;
+ arrayStr = g_strsplit(signalStr, "\"", 3);
/* look for the ci signal */
- if (strstr(arrayStr[0], "ci(") && (arrayStr[1] != NULL) ) {
+ if (g_strv_length(arrayStr) == 3 && strstr(arrayStr[0], "ci(")) {
/* free the previous "From" field of the call, and assign the new */
g_free(*callerId);
*callerId = g_strdup(arrayStr[1]);
}
g_strfreev(arrayStr);
-
- return;
}