From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Fri, 24 Mar 2017 14:51:26 +0000 (+0100)
Subject: Check return value of regex_match instead of looking at first match
X-Git-Tag: 2.3.0alpha1~182
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=b4fad55fd732c097ac44cf7a3428281376cc5dcc;p=features.git

Check return value of regex_match instead of looking at first match

Spotted by coverity.
---

diff --git a/src/insets/ExternalTransforms.cpp b/src/insets/ExternalTransforms.cpp
index e7c8cf66c3..2381241b9a 100644
--- a/src/insets/ExternalTransforms.cpp
+++ b/src/insets/ExternalTransforms.cpp
@@ -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();