[pull] master from json-c:master

.github/workflows/meson.yml

@@ -0,0 +1,231 @@
+name: meson
+
+on: [push, pull_request]
+
+concurrency:
+  group: ${{github.workflow}}-${{github.head_ref}}
+  cancel-in-progress: true
+
+permissions:
+  contents: read
+
+jobs:
+  Linux-GCC:
+    runs-on: ubuntu-22.04
+    strategy:
+      matrix:
+        cc: ['9', '13']
+    steps:
+      - uses: actions/checkout@v4
+      - uses: egor-tensin/setup-gcc@v1
+        with:
+          version: ${{matrix.cc}}
+
+      - name: Install packages
+        run: |
+          python3 -m pip install meson ninja
+
+      - name: Compile and Test
+        run: |
+          meson setup "${{github.workspace}}/build" -Dwarning_level=3 -Dbuildtype=debug
+          meson compile -C "${{github.workspace}}/build" --verbose
+          meson test -C "${{github.workspace}}/build" --verbose
+  Linux-Clang:
+    runs-on: ubuntu-22.04
+    strategy:
+      matrix:
+        cc: ['9', '22']
+    steps:
+      - uses: actions/checkout@v4
+      - uses: egor-tensin/setup-clang@v1
+
+      - name: Install packages
+        run: |
+          python3 -m pip install meson ninja
+
+      - name: Compile and Test
+        run: |
+          meson setup "${{github.workspace}}/build" -Dwarning_level=3 -Dbuildtype=debug
+          meson compile -C "${{github.workspace}}/build" --verbose
+          meson test -C "${{github.workspace}}/build" --verbose
+  VisualStudio:
+    runs-on: windows-latest
+    strategy:
+      matrix:
+        platform: ['x64', 'x86']
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install packages
+        run: |
+          python -m pip install meson ninja
+
+      - uses: ilammy/msvc-dev-cmd@v1
+        with:
+          arch: ${{matrix.platform}}
+
+      - name: Compile and Test
+        env:
+          CFLAGS: '/analyze'
+        run: |
+          meson setup "${{github.workspace}}/build" --wrap-mode=forcefallback -Dwarning_level=3 -Dbuildtype=debug
+          meson compile -C "${{github.workspace}}/build" --verbose
+          meson test -C "${{github.workspace}}/build" --verbose
+  VisualStudio-clang-cl:
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install packages
+        run: |
+          python -m pip install meson ninja
+
+      - uses: ilammy/msvc-dev-cmd@v1
+
+      - name: Compile and Test
+        env:
+          CC: clang-cl
+        run: |
+          meson setup "${{github.workspace}}/build" -Dwarning_level=3 -Dbuildtype=debug
+          meson compile -C "${{github.workspace}}/build" --verbose
+          meson test -C "${{github.workspace}}/build" --verbose
+  MSYS2:
+    runs-on: windows-latest
+    strategy:
+      matrix:
+        platform: ['UCRT64', 'CLANG64']
+    defaults:
+      run:
+        shell: msys2 {0}
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: msys2/setup-msys2@v2
+        with:
+          msystem: ${{matrix.platform}}
+          pacboy: >-
+            cc:p
+            cmake:p
+            meson:p
+            ninja:p
+            pkgconf:p
+
+      - name: Compile and Test
+        run: |
+          meson setup "${{github.workspace}}/build" -Dwarning_level=3 -Dbuildtype=debug
+          meson compile -C "${{github.workspace}}/build" --verbose
+          meson test -C "${{github.workspace}}/build" --verbose
+  Cygwin:
+    runs-on: windows-latest
+    defaults:
+      run:
+        shell: msys2 {0}
+    steps:
+      - uses: actions/checkout@v4
+      - uses: msys2/setup-msys2@v2
+        with:
+          msystem: 'MSYS'
+          install: >-
+            gcc
+            meson
+            ninja
+      - name: Compile and Test
+        run: |
+          meson setup build -Dwarning_level=3 -Dcpp_std=gnu++20 -Dbuildtype=debug
+          meson compile -C build --verbose
+          meson test -C build --verbose
+  MacOS:
+    runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install packages
+        run: |
+          brew install meson
+
+      - name: Compile and Test
+        run: |
+          meson setup "${{github.workspace}}/build" -Dwarning_level=3 -Dbuildtype=debug
+          meson compile -C "${{github.workspace}}/build" --verbose
+          meson test -C "${{github.workspace}}/build" --verbose
+  DragonflyBSD:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: vmactions/dragonflybsd-vm@v1
+        with:
+          prepare: |
+            pkg install -y ninja meson pkgconf
+          run: |
+            meson setup "${{github.workspace}}/build" -Dwarning_level=3 -Dbuildtype=debug
+            meson compile -C "${{github.workspace}}/build" --verbose
+            meson test -C "${{github.workspace}}/build" --verbose
+  FreeBSD:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: vmactions/freebsd-vm@v1
+        with:
+          prepare: |
+            pkg install -y ninja meson pkgconf
+          run: |
+            meson setup "${{github.workspace}}/build" -Dwarning_level=3 -Dbuildtype=debug
+            meson compile -C "${{github.workspace}}/build" --verbose
+            meson test -C "${{github.workspace}}/build" --verbose
+  NetBSD:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: vmactions/netbsd-vm@v1
+        with:
+          prepare: |
+            /usr/sbin/pkg_add meson pkgconf
+          run: |
+            meson setup "${{github.workspace}}/build" -Dwarning_level=3 -Dbuildtype=debug
+            meson compile -C "${{github.workspace}}/build" --verbose
+            meson test -C "${{github.workspace}}/build" --verbose
+  OmniOS:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: vmactions/omnios-vm@v1
+        with:
+          prepare: |
+            pkg install gcc14 meson-313 ninja pkg-config python-313
+          run: |
+            /usr/lib/python3.13/bin/meson setup "${{github.workspace}}/build" -Dwarning_level=3 -Dbuildtype=debug
+            /usr/lib/python3.13/bin/meson compile -C "${{github.workspace}}/build" --verbose
+            /usr/lib/python3.13/bin/meson test -C "${{github.workspace}}/build" --verbose
+  OpenBSD:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: vmactions/openbsd-vm@v1
+        with:
+          prepare: |
+            pkg_add ninja meson pkgconf
+          run: |
+            meson setup "${{github.workspace}}/build" -Dwarning_level=3 -Dbuildtype=debug
+            meson compile -C "${{github.workspace}}/build" --verbose
+            meson test -C "${{github.workspace}}/build" --verbose
+  Alpine:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        platform: ['x86_64', 'x86', 'armhf', 'armv7', 'aarch64', 'ppc64le', 'riscv64', 's390x']
+    defaults:
+      run:
+        shell: alpine.sh {0}
+    steps:
+      - uses: actions/checkout@v4
+      - uses: jirutka/setup-alpine@v1
+        with:
+          branch: edge
+          arch: ${{matrix.platform}}
+          packages: >
+            build-base pkgconf meson samurai
+      - name: Compile and Test
+        run: |
+          meson setup "${{github.workspace}}/build" -Dwarning_level=3 -Dbuildtype=debug
+          meson compile -C "${{github.workspace}}/build" --verbose
+          meson test -C "${{github.workspace}}/build" --verbose

.travis.yml

@@ -71,11 +71,6 @@ matrix:
             - cmake
       env: CHECK="true"
 
-# osx
-    - os: osx
-      osx_image: xcode13.4
-      env: XCODE="true" CHECK="true"
-
 # run coveralls
     - os: linux
       dist: xenial
@@ -109,9 +104,6 @@ matrix:
         - lcov -r build/all_coverage.info '/usr/*' '*CMakeFiles*' '*fuzz*' '*test*' -o build/coverage.info
         - coveralls-lcov --verbose build/coverage.info
 
-#  allow_failures:
-#    - os: osx
-
 before_install:
   - echo $CC
   - echo $LANG
@@ -125,8 +117,6 @@ before_install:
     fi
 
 before_script:
-  # XXX osx on travis doesn't work w/ set -e, so turn it off :(
-  - set +e
   - mkdir -p build || echo "Failed to mkdir build"
   - cd build || echo "Failed to cd build"
   - cmake .. || echo "Failed to run cmake"
@@ -135,12 +125,8 @@ script:
   - make
   # when using bionic, Travis seems to ignore the "addons" section, so installing the packages with apt-get...
   - if [ -n "$CHECK" ]; then
-      if [ "$TRAVIS_OS_NAME" = "osx" ]; then
-        brew install doxygen;
-      else
-        if [ "$TRAVIS_DIST" = "bionic" ]; then
-          sudo apt-get install -y valgrind cppcheck doxygen;
-        fi;
+      if [ "$TRAVIS_DIST" = "bionic" ]; then
+        sudo apt-get install -y valgrind cppcheck doxygen;
       fi;
       make distcheck;
       if type cppcheck &> /dev/null ; then cppcheck --error-exitcode=1 --quiet *.h *.c tests/ ; fi;

AUTHORS

@@ -1,5 +1,6 @@
 Alan Coopersmith <alan.coopersmith@oracle.com>
 Alan Urmancheev <108410815+alurm@users.noreply.github.com>
+Alb3e3 <74142887+Alb3e3@users.noreply.github.com>
 Alexander Dahl <post@lespocky.de>
 Alexandru Ardelean <ardeleanalex@gmail.com>
 An7ar35 <eadavison@protonmail.com>
@@ -10,7 +11,7 @@ Awildidiot <69577313+0xfadead@users.noreply.github.com>
 Björn Esser <besser82@fedoraproject.org>
 BonsaY <bonsay@posteo.de>
 Bruno Haible <bruno@clisp.org>
-Cameron Armstrong <cameronscottarmstrong@gmail.com>
+Cameron Armstrong (Nightfox) <cameronscottarmstrong@gmail.com>
 Careles <zhancheng1996@gmail.com>
 changyong guo <guo1487@163.com>
 chenguoping <chenguopingdota@163.com>
@@ -24,6 +25,7 @@ David McCann <mccannd@uk.ibm.com>
 DeX77 <dex@dragonslave.de>
 Dimitri Papadopoulos <3234522+DimitriPapadopoulos@users.noreply.github.com>
 dota17 <chenguopingdota@163.com>
+dxbjavid <dxbjavid@gmail.com>
 Eric Haszlakiewicz <erh+git@nimenees.com>
 Eric Hawicz <erh+git@nimenees.com>
 Evan Si <evsi@amazon.com>
@@ -40,6 +42,7 @@ hofnarr <hofnarr@hofnarr.fi>
 ihsinme <61293369+ihsinme@users.noreply.github.com>
 Ivan Romanov <drizt@land.ru>
 Jaap Keuter <jaap.keuter@xs4all.nl>
+JaisonZheng <1254186821@qq.com>
 Jakov Smolic <jakov.smolic@sartura.hr>
 janczer <menshikov.ivn@gmail.com>
 Ján Tomko <jtomko@redhat.com>
@@ -56,13 +59,15 @@ Kizuna-Meraki <z9@kizunameraki.de>
 Lakshmi-Surekha <Lakshmi.Kovvuri@ibm.com>
 Leon Gross <leon.gross@rub.de>
 Liang, Gao <liang.gao@intel.com>
+lone <lonechan314@qq.com>
 Luca Mannella <luca.mannella@studenti.polito.it>
 Marc <34656315+MarcT512@users.noreply.github.com>
 Matthias Gatto <matthias.gatto@protonmail.com>
 max <mpano91@gmail.com>
 Micah Snyder <micasnyd@cisco.com>
 Michael Clark <michael@metaparadigm.com>
 Michele Locati <michele@locati.it>
+Milan Broz <gmazyland@gmail.com>
 myd7349 <myd7349@gmail.com>
 Pascal Cuoq <cuoq@trust-in-soft.com>
 Pavel Zwerschke <pavelzw@gmail.com>

CMakeLists.txt

@@ -7,7 +7,7 @@ cmake_minimum_required(VERSION 3.9...3.12)
 
 # JSON-C library is C only project.
 # PROJECT_VERSION{,_MAJOR,_MINOR,_PATCH} set by project():
-project(json-c LANGUAGES C VERSION 0.18.99)
+project(json-c LANGUAGES C VERSION 0.19.99)
 
 # set default build type if not specified by user
 if(NOT CMAKE_BUILD_TYPE)
@@ -267,6 +267,7 @@ if (HAVE_SYS_RANDOM_H)
 endif()
 if (HAVE_SYS_RESOURCE_H)
     check_symbol_exists(getrusage   "sys/resource.h" HAVE_GETRUSAGE)
+    check_symbol_exists(setrlimit   "sys/resource.h" HAVE_SETRLIMIT)
 endif()
 
 check_symbol_exists(strtoll     "stdlib.h" HAVE_STRTOLL)
@@ -543,7 +544,7 @@ add_library(${PROJECT_NAME}
     ${JSON_C_RESOURCES}
 )
 set_target_properties(${PROJECT_NAME} PROPERTIES
-    VERSION 5.4.0
+    VERSION 5.5.0
     SOVERSION 5)
 list(APPEND CMAKE_TARGETS ${PROJECT_NAME})
 # If json-c is used as subroject it set to target correct interface -I flags and allow

ChangeLog

@@ -1,5 +1,5 @@
 
-0.19 (up to commit 8948568, 2026-01-18)
+0.19 (up to commit 3c1cf2b, 2026-06-27)
 ========================================
 
 Deprecated and removed features:
@@ -32,6 +32,14 @@ Significant changes and bug fixes
 * Fix bug involving supplemental code points that look like high surrogates
 * Fix runtime issue with test_util_file.c in Windows (add O_BINARY)
 * Fix macro WIN32_LEAN_AND_MEAN redefined
+* Issue #914: Fix Memory usage regression due to newlocale() on macOS
+* Issue #916: Fix OOM via large array index in json_pointer_set
+* Issue #923: Avoid stack recursion in json_object_put()
+* Issue #927: CVE-2026-9146 - update json_object_iterator documentation
+* Issue #929: CVE-2026-11322 - fix information disclosure bug in apps/json_parse (not installed by default)
+* Issue #930: fix locale-dependent strtod in json_object_get_double
+* Issue #931: deep copy values in json_patch copy op to avoid aliasing and cycles
+
 
 0.18 (up to commit 6bfab90, 2024-09-15)
 ========================================

RELEASE_CHECKLIST.txt

@@ -186,4 +186,15 @@ Copy and paste this output into the wiki page at:
 
 ------------
 
+Create a release on GitHub
+
+* https://github.com/json-c/json-c/releases
+* Click on "Draft a new release"
+* Choose the appropriate tag
+* Fill in title, refer to the ChangeLog in the release notes
+* Attach the same tarballs as were uploaded to S3
+* When satisfied, click Publish release.
+
+------------
+
 Send an email to the mailing list.