Convert range API to always use wmem memory.

This is mostly to address memory leaks in range preferences (the biggest
user of range functionality) on shutdown.
Now range preferences must use epan scoped memory when referencing
internal preference structures to keep consistency.

Change-Id: Idc644f59b5b42fa1d46891542b53ff13ea754157
Reviewed-on: https://code.wireshark.org/review/19387
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Michael Mann <mmann78@netscape.net>

1 files changed, 4 insertions, 4 deletions

diff --git a/ui/qt/preferences_dialog.cpp b/ui/qt/preferences_dialog.cpp
index 34a7ade73a..f8f521d4cd 100644
--- a/ui/qt/preferences_dialog.cpp
+++ b/ui/qt/preferences_dialog.cpp
@@ -895,14 +895,14 @@ void PreferencesDialog::rangePrefTextChanged(const QString &text)
         syntax_edit->setSyntaxState(SyntaxLineEdit::Empty);
     } else {
         range_t *newrange;
-        convert_ret_t ret = range_convert_str(&newrange, text.toUtf8().constData(), pref->info.max_value);
+        convert_ret_t ret = range_convert_str(NULL, &newrange, text.toUtf8().constData(), pref->info.max_value);
 
         if (ret == CVT_NO_ERROR) {
             syntax_edit->setSyntaxState(SyntaxLineEdit::Valid);
-            g_free(newrange);
         } else {
             syntax_edit->setSyntaxState(SyntaxLineEdit::Invalid);
         }
+        wmem_free(NULL, newrange);
     }
 }
 
@@ -916,10 +916,10 @@ void PreferencesDialog::rangePrefEditingFinished()
     if (!pref) return;
 
     range_t *newrange;
-    convert_ret_t ret = range_convert_str(&newrange, syntax_edit->text().toUtf8().constData(), pref->info.max_value);
+    convert_ret_t ret = range_convert_str(wmem_epan_scope(), &newrange, syntax_edit->text().toUtf8().constData(), pref->info.max_value);
 
     if (ret == CVT_NO_ERROR) {
-        g_free(pref->stashed_val.range);
+        wmem_free(wmem_epan_scope(), pref->stashed_val.range);
         pref->stashed_val.range = newrange;
     }
     pd_ui_->advancedTree->removeItemWidget(adv_ti, 3);