Merge branch 'master' of github.com:doxygen/doxygen

2 files changed, 3 insertions, 1 deletions

diff --git a/src/htags.cpp b/src/htags.cpp
index 77b1f8d..7f5870d 100644
--- a/src/htags.cpp
+++ b/src/htags.cpp
@@ -128,7 +128,7 @@ bool Htags::loadFilemap(const QCString &htmlDir)
       int len;
       while ((len=f.readLine(line.rawData(),maxlen))>0)
       {
-        line.resize(len+1);
+        line.at(len)='\0';
         //printf("Read line: %s",line.data());
         int sep = line.find('\t');
         if (sep!=-1)
diff --git a/src/memberdef.cpp b/src/memberdef.cpp
index cd3cc46..3442229 100644
--- a/src/memberdef.cpp
+++ b/src/memberdef.cpp
@@ -5929,6 +5929,7 @@ void MemberDefImpl::copyArgumentNames(MemberDef *bmd)
       for (;(argDst=aliDst.current()) && (argSrc=aliSrc.current());++aliDst,++aliSrc)
       {
         argDst->name = argSrc->name;
+        argDst->docs = argSrc->docs;
       }
     }
   }
@@ -5943,6 +5944,7 @@ void MemberDefImpl::copyArgumentNames(MemberDef *bmd)
       for (;(argDst=aliDst.current()) && (argSrc=aliSrc.current());++aliDst,++aliSrc)
       {
         argDst->name = argSrc->name;
+        argDst->docs = argSrc->docs;
       }
     }
   }