Avoid unnecessary strlen call and check error condition in celix_prop…

…erties_storeEscapedString.
apache · Nov 19, 2023 · caedd79 · caedd79
1 parent 03731d6
commit caedd79
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/libs/utils/gtest/src/PropertiesTestSuite.cc b/libs/utils/gtest/src/PropertiesTestSuite.cc
@@ -677,6 +677,7 @@ TEST_F(PropertiesTestSuite, PropertiesNullArgumentsTest) {
     EXPECT_EQ(CELIX_SUCCESS, celix_properties_setDouble(nullptr, "key", 1.0));
     EXPECT_EQ(CELIX_SUCCESS, celix_properties_setBool(nullptr, "key", true));
     EXPECT_EQ(CELIX_SUCCESS, celix_properties_setVersion(nullptr, "key", nullptr));
+    EXPECT_EQ(CELIX_SUCCESS, celix_properties_setVersionWithoutCopy(nullptr, "key", nullptr));
     celix_autoptr(celix_properties_t) copy = celix_properties_copy(nullptr);
     EXPECT_NE(nullptr, copy);
 }

diff --git a/libs/utils/src/properties.c b/libs/utils/src/properties.c
@@ -547,11 +547,12 @@ celix_properties_t* celix_properties_loadFromString(const char* input) {
  */
 static int celix_properties_storeEscapedString(FILE* file, const char* str) {
     int rc = 0;
-    for (int i = 0; i < strlen(str); i += 1) {
+    size_t len = strlen(str);
+    for (size_t i = 0; i < len && rc != EOF; i += 1) {
         if (str[i] == '#' || str[i] == '!' || str[i] == '=' || str[i] == ':') {
             rc = fputc('\\', file);
             if (rc == EOF) {
-                break;
+                continue;
             }
         }
         rc = fputc(str[i], file);