Memory safety improvements

Author: diffstorm

ini_parser.h

@@ -225,6 +225,8 @@ bool ini_initialize(ini_context_t *ctx, const char *content, size_t length)
         return false;
     }
 
+    ctx->content = NULL;
+    ctx->sections = NULL;
     ctx->content = calloc(1, length + 1);
 
     if(!ctx->content)
@@ -238,6 +240,7 @@ bool ini_initialize(ini_context_t *ctx, const char *content, size_t length)
     ini_section_t *currentSection = NULL;
     char line[INI_MAX_LINE_LENGTH];
     const char *ptr = ctx->content;
+    bool has_valid_entries = false;
 
     while(*ptr)
     {
@@ -294,6 +297,7 @@ bool ini_initialize(ini_context_t *ctx, const char *content, size_t length)
             }
 
             currentSection = newSection;
+            has_valid_entries = true;
         }
         else if(type == INI_LINE_KEY_VALUE && currentSection)
         {
@@ -326,6 +330,8 @@ bool ini_initialize(ini_context_t *ctx, const char *content, size_t length)
 
                 last->next = newKv;
             }
+
+            has_valid_entries = true;
         }
 
         if(*ptr)
@@ -334,6 +340,12 @@ bool ini_initialize(ini_context_t *ctx, const char *content, size_t length)
         }
     }
 
+    if(!has_valid_entries)
+    {
+        ini_cleanup(ctx);
+        return false;
+    }
+
     return true;
 }
 
@@ -344,23 +356,28 @@ void ini_cleanup(ini_context_t *ctx)
         return;
     }
 
-    free(ctx->content);
+    if(ctx->content)
+    {
+        free(ctx->content);
+        ctx->content = NULL;
+    }
+
     ini_section_t *section = ctx->sections;
 
     while(section)
     {
-        ini_section_t *nextSection = section->next;
+        ini_section_t *next_section = section->next;
         ini_keyvalue_t *kv = section->keyValues;
 
         while(kv)
         {
-            ini_keyvalue_t *nextKv = kv->next;
+            ini_keyvalue_t *next_kv = kv->next;
             free(kv);
-            kv = nextKv;
+            kv = next_kv;
         }
 
         free(section);
-        section = nextSection;
+        section = next_section;
     }
 
     ctx->sections = NULL;

ini_parser_tests.cpp

@@ -226,6 +226,33 @@ TEST_F(IniParserTest, KeyWithoutSection)
     EXPECT_TRUE(ini_hasKey(&ctx, "section1", "key2"));
 }
 
+TEST_F(IniParserTest, HandlesCRLFFiles)
+{
+    const char *content = "[section]\r\nkey=value\r\n";
+    ASSERT_TRUE(LoadIniContent(content));
+    char value[INI_MAX_LINE_LENGTH];
+    EXPECT_TRUE(ini_getValue(&ctx, "section", "key", value, sizeof(value)));
+    EXPECT_STREQ(value, "value");
+}
+
+TEST_F(IniParserTest, MaxLineLengthHandling)
+{
+    std::string long_line(INI_MAX_LINE_LENGTH * 2, 'a');
+    std::string content = "[section]\n" + long_line + "\n";
+    ASSERT_TRUE(ini_initialize(&ctx, content.c_str(), content.size()));
+}
+
+TEST_F(IniParserTest, MemorySafetyOnInvalidInput)
+{
+    const char *content = "[section\nkey=value"; // Missing ] and unterminated quote
+    ini_context_t ctx;
+    EXPECT_FALSE(ini_initialize(&ctx, content, strlen(content)));
+    // Safe to call multiple times
+    ini_cleanup(&ctx);
+    ini_cleanup(&ctx); // Double call test
+    ini_cleanup(&ctx); // Triple call test
+}
+
 TEST_F(IniParserTest, ComprehensiveParsing)
 {
     const char *content = R"INI(