diff options
author | Guy Harris <guy@alum.mit.edu> | 2015-01-13 15:13:40 -0800 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2015-01-13 23:14:13 +0000 |
commit | 63a3d043e3f14eebb0798a250d9aecdc8e89dfb9 (patch) | |
tree | 69a58dd4cadfc7f98669cba229e76fa8c60e0761 /epan/radius_dict.l | |
parent | 9f5e4fb7a51741a286ce5bc92a6f335ed58587a2 (diff) |
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 <guy@alum.mit.edu>
Diffstat (limited to 'epan/radius_dict.l')
-rw-r--r-- | epan/radius_dict.l | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/epan/radius_dict.l b/epan/radius_dict.l index b4600ed393..25f313afb3 100644 --- a/epan/radius_dict.l +++ b/epan/radius_dict.l @@ -609,8 +609,7 @@ gboolean radius_load_dictionary (radius_dictionary_t* d, gchar* dir, const gchar if (!yyin) { g_string_append_printf(error, "Could not open file: '%s', error: %s\n", fullpaths[include_stack_ptr], g_strerror(errno) ); g_free(fullpaths[include_stack_ptr]); - *err_str = error->str; - g_string_free(error,FALSE); + *err_str = g_string_free(error,FALSE); return FALSE; } @@ -632,8 +631,7 @@ gboolean radius_load_dictionary (radius_dictionary_t* d, gchar* dir, const gchar g_hash_table_foreach_remove(value_strings,destroy_value_strings,NULL); if (error->len > 0) { - *err_str = error->str; - g_string_free(error,FALSE); + *err_str = g_string_free(error,FALSE); return FALSE; } else { *err_str = NULL; |