Update Repeat and Multiply accordingly.

Signed-off-by: Mei Chu <meimchu@gmail.com>

Author: meimchu

src/utils/StringUtils.h

@@ -347,6 +347,8 @@ inline std::string Multiply(const std::string & str, size_t n)
     if (n == 0) { return ""; }
     if (n == 1) { return str; }
 
+    if (str.empty()) { return ""; }
+
     std::ostringstream os;
     for(size_t i = 0; i < n; ++i) { os << str; }
     return os.str();
@@ -358,12 +360,9 @@ inline std::string Repeat(const std::string & str, size_t n)
     // Early exit and match pystring::mul behaviour.
     if (n == 0) { return {}; }
     if (n == 1) { return str; }
-    const auto str_size = str.size();
 
-    // Check for overflow if n is greater than maximum allowable repeat with string max_size.
-    // New behaviour compared to pystring::mul and StringUtil::Multiply.
-    // limits.h says size_t max size is 18446744073709551615.
-    if (n > str.max_size() / str_size) { return {}; }
+    if (str.empty()) { return {}; }
+    const auto str_size = str.size();
 
     std::string result;
     result.reserve(str_size * n);

tests/cpu/ops/noop/NoOps_tests.cpp

@@ -242,6 +242,8 @@ OCIO_ADD_TEST(NoOps, partition_gpu_ops)
     OCIO_CHECK_NO_THROW( AssertPartitionIntegrity(gpuPreOps,
                                                   gpuLatticeOps,
                                                   gpuPostOps) );
+    std::cerr << "gpuPreOps" << std::endl;
+    std::cerr << SerializeOpVec(gpuPreOps, 4) << std::endl;
     /*
     std::cerr << "gpuPreOps" << std::endl;
     std::cerr << SerializeOpVec(gpuPreOps, 4) << std::endl;

tests/utils/StringUtils_tests.cpp

@@ -131,7 +131,7 @@ OCIO_ADD_TEST(StringUtils, split)
 
     // Something important to notice and preserve.
     {
-        // Note: StringUtils::Split() is mainly used to parse some string content enumerating 
+        // Note: StringUtils::Split() is mainly used to parse some string content enumerating
         // a list of substrings (i.e. separator could be a space, comma, etc). In that use case,
         // a string like ",," must return three entries. Refer to 'looks' parsing for example.
         // However, StringUtils::SplitByLines() is mainly used to read some file content where
@@ -287,6 +287,10 @@ OCIO_ADD_TEST(StringUtils, multiply)
     OCIO_CHECK_EQUAL(StringUtils::Multiply(" ", 0), "");
     OCIO_CHECK_EQUAL(StringUtils::Multiply(" ", 1), " ");
     OCIO_CHECK_EQUAL(StringUtils::Multiply(" ", 2), "  ");
+
+    OCIO_CHECK_EQUAL(StringUtils::Multiply("", 0), "");
+    OCIO_CHECK_EQUAL(StringUtils::Multiply("", 1), "");
+    OCIO_CHECK_EQUAL(StringUtils::Multiply("", 2), "");
 }
 
 OCIO_ADD_TEST(StringUtils, repeat)
@@ -300,4 +304,8 @@ OCIO_ADD_TEST(StringUtils, repeat)
     OCIO_CHECK_EQUAL(StringUtils::Repeat(" ", 0), "");
     OCIO_CHECK_EQUAL(StringUtils::Repeat(" ", 1), " ");
     OCIO_CHECK_EQUAL(StringUtils::Repeat(" ", 2), "  ");
+
+    OCIO_CHECK_EQUAL(StringUtils::Repeat("", 0), "");
+    OCIO_CHECK_EQUAL(StringUtils::Repeat("", 1), "");
+    OCIO_CHECK_EQUAL(StringUtils::Repeat("", 2), "");
 }