core: fix String::end() implementation

alalek · alalek · commit 9ac9e9e29ad6 · 2017-02-09T16:36:22.000+03:00
diff --git a/modules/core/include/opencv2/core/cvstd.hpp b/modules/core/include/opencv2/core/cvstd.hpp
@@ -748,7 +748,7 @@ const char* String::begin() const
 inline
 const char* String::end() const
 {
-    return len_ ? cstr_ + 1 : 0;
+    return len_ ? cstr_ + len_ : NULL;
 }
 
 inline
diff --git a/modules/core/test/test_misc.cpp b/modules/core/test/test_misc.cpp
@@ -138,3 +138,10 @@ TEST(Core_String, find_last_of__with__empty_string)
     // npos is not exported: EXPECT_EQ(cv::String::npos, p);
     EXPECT_EQ(std::string::npos, p);
 }
+
+TEST(Core_String, end_method_regression)
+{
+    cv::String old_string = "012345";
+    cv::String new_string(old_string.begin(), old_string.end());
+    EXPECT_EQ(6u, new_string.size());
+}

Original file line number	Diff line number	Diff line change
`@@ -748,7 +748,7 @@ const char* String::begin() const`
`748`	`748`	`inline`
`749`	`749`	`const char* String::end() const`
`750`	`750`	`{`
`751`		`- return len_ ? cstr_ + 1 : 0;`
	`751`	`+ return len_ ? cstr_ + len_ : NULL;`
`752`	`752`	`}`
`753`	`753`
`754`	`754`	`inline`