From 63a3d043e3f14eebb0798a250d9aecdc8e89dfb9 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Tue, 13 Jan 2015 15:13:40 -0800 Subject: Consistently use the "g_string_free returns a C string pointer" idiom. g_string_free(str, FALSE) frees the GString container but not the underlying g_malloc()ed string; instead, it returns a pointer to the g_malloc()ed string. Fix those places that didn't already get the string pointer from g_string_free() to do so rather than manually extracting the string themselves. And fix one place that didn't even need to use a string - it was just scanning a C string without even modifying it. Change-Id: Ibbf4872bf5b9935b9907f539b6edb1013f3053a5 Reviewed-on: https://code.wireshark.org/review/6532 Reviewed-by: Guy Harris --- caputils/airpcap_loader.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) (limited to 'caputils') diff --git a/caputils/airpcap_loader.c b/caputils/airpcap_loader.c index 6ac4b2a633..934063f63d 100644 --- a/caputils/airpcap_loader.c +++ b/caputils/airpcap_loader.c @@ -212,34 +212,29 @@ get_wep_key(pref_t *pref, gpointer ud) gboolean wep_key_is_valid(char* key) { - GString *new_key_string; - guint i=0; + size_t strsize, i; if (key == NULL) return FALSE; - new_key_string = g_string_new(key); + strsize = strlen(key); - if ( ((new_key_string->len) > WEP_KEY_MAX_CHAR_SIZE) || ((new_key_string->len) < 2)) + if ( (strsize > WEP_KEY_MAX_CHAR_SIZE) || (strsize < 2)) { - g_string_free(new_key_string,FALSE); return FALSE; } - if ((new_key_string->len % 2) != 0) + if ((strsize % 2) != 0) { - g_string_free(new_key_string,FALSE); return FALSE; } - for(i = 0; i < new_key_string->len; i++) + for(i = 0; i < strsize; i++) { - if (!g_ascii_isxdigit(new_key_string->str[i])) + if (!g_ascii_isxdigit(key[i])) { - g_string_free(new_key_string,FALSE); return FALSE; } } - g_string_free(new_key_string,FALSE); return TRUE; } -- cgit v1.2.1