anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-11 03:03:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

There are other ways we can get in trouble, so let's impose the limit

Browse Source 
slightly differently.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33927 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Richard Heck 2010-03-29 20:52:07 +00:00
parent 9c77c1248b
commit 2a21c12eab
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/BiblioInfo.cpp
View File

@ -396,22 +396,21 @@ namespace {
docstring BibTeXInfo::expandFormat(string const & format,
BibTeXInfo const * const xref, Buffer const & buf,
BibTeXInfo const * const xref, int & counter, Buffer const & buf,
bool richtext) const
{
// incorrect use of macros could put us in an infinite loop
static int max_passes = 1000;
static int max_passes = 5000;
docstring ret; // return value
string key;
bool scanning_key = false;
bool scanning_rich = false;
int passes = 0;
string fmt = format;
// we'll remove characters from the front of fmt as we
// deal with them
while (fmt.size()) {
if (passes++ > max_passes) {
if (counter++ > max_passes) {
LYXERR0("Recursion limit reached while parsing `"
<< format << "'.");
return _("ERROR!");
@ -466,9 +465,9 @@ docstring BibTeXInfo::expandFormat(string const & format,
fmt = newfmt;
docstring const val = getValueForKey(optkey, xref);
if (!val.empty())
ret += expandFormat(ifpart, xref, buf, richtext);
ret += expandFormat(ifpart, xref, counter, buf, richtext);
else if (!elsepart.empty())
ret += expandFormat(elsepart, xref, buf, richtext);
ret += expandFormat(elsepart, xref, counter, buf, richtext);
// fmt will have been shortened for us already
continue;
}
@ -524,7 +523,8 @@ docstring const & BibTeXInfo::getInfo(BibTeXInfo const * const xref,
DocumentClass const & dc = buf.params().documentClass();
string const & format = dc.getCiteFormat(to_utf8(entry_type_));
info_ = expandFormat(format, xref, buf, richtext);
int counter = 0;
info_ = expandFormat(format, xref, counter, buf, richtext);
if (!info_.empty())
info_ = convertLaTeXCommands(info_);

2
src/BiblioInfo.h
View File

@ -122,7 +122,7 @@ private:
/// moreover, keys that look like "%_key%" are treated as translatable
/// so that things like "pp." and "vol." can be translated.
docstring expandFormat(std::string const & fmt,
BibTeXInfo const * const xref,
BibTeXInfo const * const xref, int & counter,
Buffer const & buf, bool richtext) const;
/// true if from BibTeX; false if from bibliography environment
bool is_bibtex_;