Merge branch 'master' into utf8-conversion-2

diff --git a/cde/lib/DtHelp/Access.c b/cde/lib/DtHelp/Access.c
index bd08c941cb838b93bbf6b74f5315eaf4fae65f27..5b2ac47508e9728278ce9f9c7b06d1c386b6d347 100644 (file)
--- a/cde/lib/DtHelp/Access.c
+++ b/cde/lib/DtHelp/Access.c
@@ -2654,7 +2654,6 @@ _DtHelpCeIsTopTopic (
        if (_DtHelpCeMapCcdfTargetToId(vol, id, &topicId) == 0 &&
                                _DtHelpCeGetCcdfTopTopic(vol, &topId) == 0)
             result = _DtHelpCeStrCaseCmpLatin1(topId, topicId);
-        free(topicId);
       }
     else if (_DtHelpCeMapIdToSdlTopicId(vol, id, &topicId) == 0)
       {

diff --git a/cde/lib/DtHelp/GlobSearch.c b/cde/lib/DtHelp/GlobSearch.c
index e789e6e7e5d879582f9226aead03796cadda3616..ef572f4949be334bb7f033534209d1daeab7a269 100644 (file)
--- a/cde/lib/DtHelp/GlobSearch.c
+++ b/cde/lib/DtHelp/GlobSearch.c
@@ -510,9 +510,6 @@ static Boolean GetVolumeInfoCB (
          *ret_docId = locDocId ? locDocId : XtNewString(&empty);
       if (ret_timeStamp) 
          *ret_timeStamp = locTimeStamp?locTimeStamp:XtNewString(&empty);
-         
-      free(locDocId);
-      free(locTimeStamp);
    }
 
    if (ret_nameKey)