Merge branch 'release/v4.2.6'

Author: lmoellendorf

.gitignore

@@ -14,3 +14,5 @@
 # CMake build directories
 build*/
 html/
+# ingore temporary vim files
+*.swp

CMakeLists.txt

@@ -5,7 +5,7 @@ project(
   DESCRIPTION "C library for parsing INI-style files"
   HOMEPAGE_URL https://gitlab.com/iniparser/iniparser/
   LANGUAGES C
-  VERSION 4.2.5)
+  VERSION 4.2.6)
 
 include(GNUInstallDirs)
 include(CMakePackageConfigHelpers)
@@ -207,6 +207,8 @@ if(BUILD_DOCS)
   doxygen_add_docs(
     docs
     ${CMAKE_CURRENT_SOURCE_DIR}/README.md
+    ${CMAKE_CURRENT_SOURCE_DIR}/FAQ-en.md
+    ${CMAKE_CURRENT_SOURCE_DIR}/FAQ-zhcn.md
     ${CMAKE_CURRENT_SOURCE_DIR}/src/iniparser.h
     ALL)
   install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html

README.md

@@ -11,7 +11,7 @@ Go there for:
 - [Merge Requests](https://gitlab.com/iniparser/iniparser/-/merge_requests/new)
 
 Changes in March 2024:
-@lmoellendorf took over maintenance for this project.
+\@lmoellendorf took over maintenance for this project.
 
 - [X] The objective was to get all known issues fixed and released as v4.2.
 - [X] After that, this project has been frozen on Github as v4.2.1 and
@@ -21,7 +21,7 @@ Changes in March 2024:
 Thanks a million times to Lars for his tremendous work and help in keeping this
 library alive!
 
-Many thanks to @touilleman for his exceptional contributions and efforts for
+Many thanks to \@touilleman for his exceptional contributions and efforts for
 maintaining this project for a decade. Manu, you rock!
 
 ## Overview
@@ -35,6 +35,12 @@ Key features:
  - Fully re-entrant : easy to make it thread-safe (just surround
    library calls by mutex)
 
+## Installation
+
+iniParser is available in a number of package repositories:
+
+[![Packaging status](https://repology.org/badge/vertical-allrepos/iniparser.svg)](https://repology.org/project/iniparser/versions)
+
 ## MinGW
 
 In the instructions below, replace `make all` by `ninja` if you are using
@@ -139,7 +145,7 @@ make all
 Open the file `html/index.html` with any HTML-capable browser.
 
 Or see the [complete documentation](https://iniparser.gitlab.io/iniparser/)
-in online.
+online.
 
 
 ## License
@@ -282,7 +288,7 @@ the section name, and a NULL associated value. They can be queried through
 `iniparser_find_entry()`.
 
 To launch the parser, use the function called `iniparser_load()`, which takes
-an input file name and returns a newly allocated @e dictionary structure. This
+an input file name and returns a newly allocated `dictionary` structure. This
 latter object should remain opaque to the user and only accessed through the
 following accessor functions:
 

compile_commands.json

@@ -0,0 +1 @@
+build/compile_commands.json

src/iniparser.c

@@ -325,8 +325,9 @@ void iniparser_dumpsection_ini(const dictionary * d, const char * s, FILE * f)
     int     seclen ;
     char escaped[(ASCIILINESZ * 2) + 2] = "";
 
-    if (d==NULL || f==NULL) return ;
-    if (! iniparser_find_entry(d, s)) return ;
+    if (d==NULL || f==NULL) return;
+    if (! iniparser_find_entry(d, s)) return;
+    if (strlen(s) > sizeof(keym)) return;
 
     seclen  = (int)strlen(s);
     fprintf(f, "\n[%s]\n", s);

test/CMakeLists.txt

@@ -34,7 +34,8 @@ FetchContent_Declare(
                 ${CMAKE_CURRENT_LIST_DIR}/unity_config.h ./src/)
 
 FetchContent_MakeAvailable(unity)
-target_compile_definitions(unity PUBLIC UNITY_INCLUDE_CONFIG_H)
+target_compile_definitions(unity PUBLIC UNITY_INCLUDE_CONFIG_H
+                                        UNITY_USE_COMMAND_LINE_ARGS)
 
 function(create_test_runner)
   set(options)
@@ -53,7 +54,7 @@ function(create_test_runner)
     COMMAND
       ${RUBY_EXECUTABLE} ${unity_SOURCE_DIR}/auto/generate_test_runner.rb
       ${CMAKE_CURRENT_SOURCE_DIR}/test_${TEST_RUNNER_NAME}.c
-      test_${TEST_RUNNER_NAME}_runner.c
+      test_${TEST_RUNNER_NAME}_runner.c ${CMAKE_CURRENT_LIST_DIR}/unity-config.yml
     DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/test_${TEST_RUNNER_NAME}.c
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
 

test/test_iniparser.c

@@ -1042,6 +1042,8 @@ void test_iniparser_dump_ini(void)
 void test_iniparser_dumpsection_ini(void)
 {
     const char *str;
+    char key[4096] = {};
+    int ret;
 
     /*loading old.ini*/
     dic = iniparser_load(OLD_INI_PATH);
@@ -1070,6 +1072,20 @@ void test_iniparser_dumpsection_ini(void)
     TEST_ASSERT_EQUAL_STRING("321abc", str);
     iniparser_freedict(dic);
     dic = NULL;
+    /*test extra large keys*/
+    dic = dictionary_new(0);
+    TEST_ASSERT_NOT_NULL(dic);
+    memset(key, 'a', sizeof(key)-1);
+    ret = iniparser_set(dic, key, "dummy");
+    TEST_ASSERT_GREATER_OR_EQUAL(0, ret);
+    ini = fopen(TMP_INI_PATH, "wt");
+    TEST_ASSERT_NOT_NULL_MESSAGE(ini, "cannot open " TMP_INI_PATH);
+    /*dump the data of old.ini to test.ini*/
+    iniparser_dumpsection_ini(dic,key,ini);
+    fclose(ini);
+    ini = NULL;
+    iniparser_freedict(dic);
+    dic = NULL;
 }
 
 void test_iniparser_find_entry(void)

test/unity-config.yml

@@ -0,0 +1,2 @@
+:unity:
+    :cmdline_args: 1