A bit more tolerant check to return itself in String::substr().

diff --git a/taglib/toolkit/tstring.cpp b/taglib/toolkit/tstring.cpp
index ee8d04d1a9eda27339d0bb8af4781ae4c404b277..1639d7c5057ae01783afadce55749597577aad51 100644 (file)
--- a/taglib/toolkit/tstring.cpp
+++ b/taglib/toolkit/tstring.cpp
@@ -447,7 +447,7 @@ bool String::startsWith(const String &s) const
 
 String String::substr(unsigned int position, unsigned int n) const
 {
-  if(position == 0 && n == size())
+  if(position == 0 && n >= size())
     return *this;
   else
     return String(d->data.substr(position, n));

diff --git a/tests/test_string.cpp b/tests/test_string.cpp
index b99c3f304b678b0c84018cd40d17309e696cd728..4e3a1ac5381a944b548d047563217143fbf59625 100644 (file)
--- a/tests/test_string.cpp
+++ b/tests/test_string.cpp
@@ -257,6 +257,8 @@ public:
     CPPUNIT_ASSERT_EQUAL(String("01"), String("0123456").substr(0, 2));
     CPPUNIT_ASSERT_EQUAL(String("12"), String("0123456").substr(1, 2));
     CPPUNIT_ASSERT_EQUAL(String("123456"), String("0123456").substr(1, 200));
+    CPPUNIT_ASSERT_EQUAL(String("0123456"), String("0123456").substr(0, 7));
+    CPPUNIT_ASSERT_EQUAL(String("0123456"), String("0123456").substr(0, 200));
   }
 
   void testNewline()