anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-09-20 06:49:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Amend c734504d to fix a very bad nullptr dereferencing...

Browse Source
This commit is contained in:
Thibaut Cuvelier 2021-12-26 02:24:06 +01:00
parent 81274c8da7
commit 4c27a7307e
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/insets/InsetFloat.cpp
View File

@ -759,8 +759,7 @@ void docbookGenerateFillerTable(XMLStream & xs, BufferParams::TableOutput format
void docbookNoSubfigures(XMLStream & xs, OutputParams const & runparams, const InsetCaption * caption,
const InsetLabel * label, Floating const & ftype, const InsetFloat * thisFloat)
{
const InsetLabel * label, Floating const & ftype, const InsetFloat * thisFloat) {
// Ensure there is no label output, it is supposed to be handled as xml:id.
OutputParams rpNoLabel = runparams;
if (label)
@ -775,15 +774,23 @@ void docbookNoSubfigures(XMLStream & xs, OutputParams const & runparams, const I
// Generate the contents of the float (to check for emptiness).
odocstringstream osFloatContent;
XMLStream xsFloatContent(osFloatContent);
thisFloat->InsetText::docbook(xsFloatContent, rpNoTitle);
bool hasFloat = !osFloatContent.str().empty();
bool hasFloat = false;
if (thisFloat) {
XMLStream xsFloatContent(osFloatContent);
thisFloat->InsetText::docbook(xsFloatContent, rpNoTitle);
hasFloat = !osFloatContent.str().empty();
}
// Do the same for the caption.
odocstringstream osCaptionContent;
XMLStream xsCaptionContent(osCaptionContent);
caption->getCaptionAsDocBook(xsCaptionContent, rpNoLabel);
bool hasCaption = !osCaptionContent.str().empty();
bool hasCaption = false;
if (caption != nullptr) {
XMLStream xsCaptionContent(osCaptionContent);
caption->getCaptionAsDocBook(xsCaptionContent, rpNoLabel);
hasCaption = !osCaptionContent.str().empty();
}
// Organisation: <float> <title if any/> <contents without title/> </float>.