1 files changed, 7 insertions, 4 deletions

diff --git a/src/plugins/fs/search.c b/src/plugins/fs/search.c
index f70f6630..916504a5 100644
--- a/src/plugins/fs/search.c
+++ b/src/plugins/fs/search.c
@@ -510,8 +510,8 @@ void on_fssearchbutton_clicked_fs(gpointer dummy2,
                            "searchNamespaceComboBoxEntry");
   if (TRUE == gtk_combo_box_get_active_iter(GTK_COMBO_BOX(searchNamespaceGtkCB),
                                             &iter)) {
-    const char * descStr;
-    const char * ns;
+    char * descStr;
+    char * ns;
 
     ns = NULL;
     descStr = NULL;
@@ -527,8 +527,9 @@ void on_fssearchbutton_clicked_fs(gpointer dummy2,
       ns = NULL;
     } else {
       GE_ASSERT(ectx, strlen(ns) == sizeof(EncName) - 1);
-      if (descStr == NULL)
-        descStr = ns;
+      if ( (descStr == NULL) &&
+           (ns != NULL) )
+        descStr = STRDUP(ns);
     }
     if (ns != NULL) {
       char * ustring;
@@ -550,6 +551,8 @@ void on_fssearchbutton_clicked_fs(gpointer dummy2,
       }
       FREE(ustring);
     }
+    FREENONNULL(descStr);
+    FREENONNULL(ns);
   }
   if (uri == NULL)
     uri = ECRS_parseCharKeywordURI(ectx, searchString);