anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Avoid crashes in case of missing document buffer for buffer based conversions.

Browse Source
This commit is contained in:
Stephan Witt 2020-02-18 08:43:22 +01:00
parent 731feb9f18
commit febbc3537a
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Converter.cpp
View File

@ -586,7 +586,7 @@ Converters::RetVal Converters::convert(Buffer const * buffer,
if (conv.latex()) {
// We are not importing, we have a buffer
LATTEST(buffer);
LASSERT(buffer, return FAILURE);
run_latex = true;
string command = conv.command();
command = subst(command, token_from, "");
@ -604,7 +604,7 @@ Converters::RetVal Converters::convert(Buffer const * buffer,
} else {
if (conv.need_aux() && !run_latex) {
// We are not importing, we have a buffer
LATTEST(buffer);
LASSERT(buffer, return FAILURE);
string command;
switch (runparams.flavor) {
case OutputParams::DVILUATEX:
@ -713,8 +713,8 @@ Converters::RetVal Converters::convert(Buffer const * buffer,
" > " + quoteName(logfile);
res = one.startscript(starttype,
to_filesystem8bit(from_utf8(command2)),
buffer->filePath(),
buffer->layoutPos());
buffer ? buffer->filePath() : string(),
buffer ? buffer->layoutPos() : string());
if (res == Systemcall::KILLED) {
frontend::Alert::warning(
_("Converter killed"),
@ -722,7 +722,7 @@ Converters::RetVal Converters::convert(Buffer const * buffer,
from_utf8(command)));
return KILLED;
}
if (!scanLog(*buffer, command, makeAbsPath(logfile, path), errorList))
if (buffer && !scanLog(*buffer, command, makeAbsPath(logfile, path), errorList))
return FAILURE;
}
}