Merge pull request opencv#5161 from alalek:fix_string

alalek · alalek · commit c1778f119910 · 2015-08-20T12:49:54.000Z
diff --git a/modules/core/include/opencv2/core/cvstd.hpp b/modules/core/include/opencv2/core/cvstd.hpp
@@ -896,6 +896,7 @@ size_t String::find_first_of(const String& str, size_t pos) const
 inline
 size_t String::find_first_of(const char* s, size_t pos) const
 {
+    if (len_ == 0) return npos;
     if (pos >= len_ || !s[0]) return npos;
     const char* lmax = cstr_ + len_;
     for (const char* i = cstr_ + pos; i < lmax; ++i)
@@ -910,6 +911,7 @@ size_t String::find_first_of(const char* s, size_t pos) const
 inline
 size_t String::find_last_of(const char* s, size_t pos, size_t n) const
 {
+    if (len_ == 0) return npos;
     if (pos >= len_) pos = len_ - 1;
     for (const char* i = cstr_ + pos; i >= cstr_; --i)
     {
@@ -935,6 +937,7 @@ size_t String::find_last_of(const String& str, size_t pos) const
 inline
 size_t String::find_last_of(const char* s, size_t pos) const
 {
+    if (len_ == 0) return npos;
     if (pos >= len_) pos = len_ - 1;
     for (const char* i = cstr_ + pos; i >= cstr_; --i)
     {
diff --git a/modules/core/test/test_misc.cpp b/modules/core/test/test_misc.cpp
@@ -129,3 +129,12 @@ TEST(Core_OutputArrayAssign, _Matxf_UMatd)
 
     EXPECT_LE(maxAbsDiff(expected, actual), FLT_EPSILON);
 }
+
+
+TEST(Core_String, find_last_of__with__empty_string)
+{
+    cv::String s;
+    size_t p = s.find_last_of("q", 0);
+    // npos is not exported: EXPECT_EQ(cv::String::npos, p);
+    EXPECT_EQ(std::string::npos, p);
+}

Original file line number	Diff line number	Diff line change
`@@ -896,6 +896,7 @@ size_t String::find_first_of(const String& str, size_t pos) const`
`896`	`896`	`inline`
`897`	`897`	`size_t String::find_first_of(const char* s, size_t pos) const`
`898`	`898`	`{`
	`899`	`+ if (len_ == 0) return npos;`
`899`	`900`	`if (pos >= len_ \|\| !s[0]) return npos;`
`900`	`901`	`const char* lmax = cstr_ + len_;`
`901`	`902`	`for (const char* i = cstr_ + pos; i < lmax; ++i)`
`@@ -910,6 +911,7 @@ size_t String::find_first_of(const char* s, size_t pos) const`
`910`	`911`	`inline`
`911`	`912`	`size_t String::find_last_of(const char* s, size_t pos, size_t n) const`
`912`	`913`	`{`
	`914`	`+ if (len_ == 0) return npos;`
`913`	`915`	`if (pos >= len_) pos = len_ - 1;`
`914`	`916`	`for (const char* i = cstr_ + pos; i >= cstr_; --i)`
`915`	`917`	`{`
`@@ -935,6 +937,7 @@ size_t String::find_last_of(const String& str, size_t pos) const`
`935`	`937`	`inline`
`936`	`938`	`size_t String::find_last_of(const char* s, size_t pos) const`
`937`	`939`	`{`
	`940`	`+ if (len_ == 0) return npos;`
`938`	`941`	`if (pos >= len_) pos = len_ - 1;`
`939`	`942`	`for (const char* i = cstr_ + pos; i >= cstr_; --i)`
`940`	`943`	`{`