doxygen: update to 1.9.3.
This commit is contained in:
parent
2cb60502ff
commit
9e5b86d801
2 changed files with 2 additions and 42 deletions
|
@ -1,40 +0,0 @@
|
|||
upstream PR: https://github.com/doxygen/doxygen/pull/8739
|
||||
|
||||
What was happening is that the TextStream object is reused for multiple
|
||||
different files. Therefore, when one calls setStream(nullptr) or
|
||||
setFile(nullptr), m_f or m_s will, respectively, still contain a pointer
|
||||
to the previous member, which is used when one calls setFile() or
|
||||
setStream() again, since these methods will call flush().
|
||||
|
||||
For example, a program doing
|
||||
|
||||
s.setFile(f1);
|
||||
s.setStream(nullptr);
|
||||
fclose(f1);
|
||||
s.setFile(f2);
|
||||
|
||||
will call fwrite(f1, ...). This pattern can be observed in many parts of
|
||||
Doxygen, so fixing it in TextStream itself by always zeroing the other
|
||||
pointer is the simplest fix.
|
||||
|
||||
diff --git a/src/textstream.h b/src/textstream.h
|
||||
index 161ce7fe..38027ec0 100644
|
||||
--- a/src/textstream.h
|
||||
+++ b/src/textstream.h
|
||||
@@ -67,11 +67,13 @@ class TextStream final
|
||||
{
|
||||
flush();
|
||||
m_s = s;
|
||||
+ m_f = nullptr;
|
||||
}
|
||||
|
||||
void setFile(FILE *f)
|
||||
{
|
||||
flush();
|
||||
+ m_s = nullptr;
|
||||
m_f = f;
|
||||
}
|
||||
|
||||
--
|
||||
2.33.0
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
# Template file for 'doxygen'
|
||||
pkgname=doxygen
|
||||
version=1.9.2
|
||||
version=1.9.3
|
||||
revision=1
|
||||
build_style=cmake
|
||||
configure_args="-DCMAKE_BUILD_TYPE=None"
|
||||
|
@ -12,7 +12,7 @@ license="GPL-2.0-only"
|
|||
homepage="http://www.doxygen.org/"
|
||||
changelog="https://www.doxygen.nl/manual/changelog.html"
|
||||
distfiles="http://doxygen.nl/files/doxygen-${version}.src.tar.gz"
|
||||
checksum=060f254bcef48673cc7ccf542736b7455b67c110b30fdaa33512a5b09bbecee5
|
||||
checksum=f352dbc3221af7012b7b00935f2dfdc9fb67a97d43287d2f6c81c50449d254e0
|
||||
|
||||
build_options="wizard"
|
||||
desc_option_wizard="build Qt5 GUI configuration tool, doxywizard"
|
||||
|
|
Loading…
Reference in a new issue