anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 05:16:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Check return value of regex_match instead of looking at first match

Browse Source 
Spotted by coverity.
This commit is contained in:
Jean-Marc Lasgouttes 2017-03-24 15:51:26 +01:00
parent 4ea0fd6af4
commit b4fad55fd7
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/insets/ExternalTransforms.cpp
View File

@ -285,8 +285,7 @@ string const sanitizeLatexOption(string const & input)
lyx::smatch what;
static lyx::regex const front("^( *\\[,*)(.*)$");
regex_match(it, end, what, front);
if (!what[0].matched) {
if (!regex_match(it, end, what, front)) {
lyxerr << "Unable to sanitize LaTeX \"Option\": "
<< input << '\n';
return string();
@ -298,8 +297,7 @@ string const sanitizeLatexOption(string const & input)
// with iterator now pointing to 'b'
static lyx::regex const commas("([^,]*)(,,*)(.*)$");
for (; it != end;) {
regex_match(it, end, what, commas);
if (!what[0].matched) {
if (!regex_match(it, end, what, commas)) {
output += string(it, end);
break;
}
@ -310,10 +308,7 @@ string const sanitizeLatexOption(string const & input)
// Strip any trailing commas
// "...foo,,,]" -> "...foo" ("...foo,,," may be empty)
static lyx::regex const back("^(.*[^,])?,*\\] *$");
// false positive from coverity
// coverity[CHECKED_RETURN]
regex_match(output, what, back);
if (!what[0].matched) {
if (!regex_match(output, what, back)) {
lyxerr << "Unable to sanitize LaTeX \"Option\": "
<< output << '\n';
return string();