From 2a8f06020242c919961da08dcfdb46095306cf94 Mon Sep 17 00:00:00 2001 From: albert-github Date: Fri, 10 May 2019 19:14:20 +0200 Subject: issue #6979 Method parameters documented inline are not present in documentation of overriding/implementing methods Not only the name of the argument should be copied but also the documentation (this routine is only used for reimplemented members). --- src/memberdef.cpp | 2 ++ 1 file changed, 2 insertions(+) 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; } } } -- cgit v0.12 From 192bbc4d99e468f6899d1cba4fb865c84037816a Mon Sep 17 00:00:00 2001 From: albert-github Date: Sun, 12 May 2019 12:44:07 +0200 Subject: Bug 781306 - *** Error in `doxygen': realloc(): invalid pointer: 0x0000000001d45ba0 @ exit Crash occurs, as indicated in error report, on line 131 of htags.cpp (line.resize(len+1);) Looks like there is a buffer problem (enlarge after making the buffer smaller beforehand). The readLine should place a `\0` at the end but to be on the save side. --- src/htags.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) -- cgit v0.12