Update toml11

package.nix

@@ -172,6 +172,7 @@ in {
           ./doc
           ./misc
           ./precompiled-headers.h
+          ./subprojects/toml11
           ./src
           ./COPYING
           ./scripts/local.mk
@@ -182,6 +183,7 @@ in {
           # Source might not be compiled, but still must be available
           # for Doxygen to gather comments.
           ./src
+          ./subprojects/toml11
           ./tests/unit
         ] ++ lib.optionals buildUnitTests [
           ./tests/unit

src/libexpr/primops/fromTOML.cc

@@ -1,7 +1,7 @@
 #include "primops.hh"
 #include "eval-inline.hh"
 
-#include "../../toml11/toml.hpp"
+#include "../../../subprojects/toml11/toml.hpp"
 
 #include <sstream>
 

subprojects/toml11/.circleci/config.yml

@@ -0,0 +1,88 @@
+version: 2.1
+
+jobs:
+  test_suite:
+    docker:
+      - image: cimg/go:1.16
+    steps:
+      - checkout
+      - run:
+          command: |
+              g++ --version
+              cd tests/
+              g++ -std=c++11 -O2 -Wall -Wextra -Werror -I../ check_toml_test.cpp -o check_toml_test
+              export PATH=$(pwd):${PATH}
+              git clone --depth 1 --branch v1.3.0 https://github.com/BurntSushi/toml-test.git
+              cd toml-test/
+              go install -v ./cmd/toml-test
+              cd -
+              toml-test check_toml_test
+#               go clean -modcache
+#               go get github.com/BurntSushi/toml-test/cmd/toml-test
+#               $GOPATH/bin/toml-test ./check_toml_test
+  test_serialization:
+    docker:
+      - image: circleci/buildpack-deps:bionic
+    steps:
+      - checkout
+      - run:
+          command: |
+              g++ --version
+              cd tests/
+              g++ -std=c++11 -O2 -Wall -Wextra -Wpedantic -Werror -I../ check_serialization.cpp -o check_serialization
+              git clone https://github.com/BurntSushi/toml-test.git
+              cp check_serialization toml-test/tests/valid
+              cd toml-test/tests/valid
+              for f in $(ls ./*.toml);
+                do echo "==> ${f}";
+                cat ${f};
+                echo "---------------------------------------";
+                ./check_serialization ${f};
+                if [ $? -ne 0 ] ; then
+                  exit 1
+                fi
+                echo "=======================================";
+              done
+  output_result:
+    docker:
+      - image: circleci/buildpack-deps:bionic
+    steps:
+      - checkout
+      - run:
+          command: |
+              g++ --version
+              cd tests/
+              g++ -std=c++11 -O2 -Wall -Wextra -Wpedantic -Werror -I../ check.cpp -o check
+              git clone https://github.com/BurntSushi/toml-test.git
+              cp check toml-test/tests/invalid
+              cp check toml-test/tests/valid
+              cd toml-test/tests/invalid
+              for f in $(ls ./*.toml);
+                do echo "==> ${f}";
+                cat ${f};
+                echo "---------------------------------------";
+                ./check ${f} invalid;
+                if [ $? -ne 0 ] ; then
+                  exit 1
+                fi
+                echo "=======================================";
+              done
+              cd ../valid
+              for f in $(ls ./*.toml);
+                do echo "==> ${f}";
+                cat ${f};
+                echo "---------------------------------------";
+                ./check ${f} valid;
+                if [ $? -ne 0 ] ; then
+                  exit 1
+                fi
+                echo "=======================================";
+              done
+
+workflows:
+  version: 2.1
+  test:
+    jobs:
+      - test_suite
+      - test_serialization
+      - output_result

subprojects/toml11/.clusterfuzzlite/Dockerfile

@@ -0,0 +1,6 @@
+FROM gcr.io/oss-fuzz-base/base-builder
+RUN apt-get update && apt-get install -y make autoconf automake libtool
+
+COPY . $SRC/toml11
+COPY .clusterfuzzlite/build.sh $SRC/build.sh
+WORKDIR $SRC/toml11

subprojects/toml11/.clusterfuzzlite/README.md

@@ -0,0 +1,3 @@
+# ClusterFuzzLite set up
+
+This folder contains a fuzzing set for [ClusterFuzzLite](https://google.github.io/clusterfuzzlite).

subprojects/toml11/.clusterfuzzlite/build.sh

@@ -0,0 +1,6 @@
+#!/bin/bash -eu
+# Copy fuzzer executable to $OUT/
+$CXX $CFLAGS $LIB_FUZZING_ENGINE \
+  $SRC/toml11/.clusterfuzzlite/parse_fuzzer.cpp \
+  -o $OUT/parse_fuzzer \
+  -I$SRC/toml11/

subprojects/toml11/.clusterfuzzlite/parse_fuzzer.cpp

@@ -0,0 +1,16 @@
+
+#include <toml.hpp>
+
+#include <sstream>
+#include <string>
+
+extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
+  std::string s(reinterpret_cast<const char *>(data), size);
+  std::istringstream iss(s);
+  try {
+    const auto ref = toml::parse(iss);
+  } catch (...) {
+  }
+
+  return 0;
+}

subprojects/toml11/.clusterfuzzlite/project.yaml

@@ -0,0 +1 @@
+language: c++

subprojects/toml11/.editorconfig

@@ -0,0 +1,13 @@
+root = true
+
+[*]
+indent_style = space
+
+[CMakeLists.txt]
+indent_size = 4
+
+[*.{c,h}*]
+indent_size = 4
+
+[*.{md,yml}]
+indent_size = 2

subprojects/toml11/.github/workflows/cflite_pr.yml

@@ -0,0 +1,30 @@
+name: ClusterFuzzLite PR fuzzing
+on:
+  workflow_dispatch:
+  pull_request:
+    branches: [ master ]
+permissions: read-all
+jobs:
+  PR:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        sanitizer: [address]
+    steps:
+    - name: Build Fuzzers (${{ matrix.sanitizer }})
+      id: build
+      uses: google/clusterfuzzlite/actions/build_fuzzers@v1
+      with:
+        sanitizer: ${{ matrix.sanitizer }}
+        language: c++
+        bad-build-check: false
+    - name: Run Fuzzers (${{ matrix.sanitizer }})
+      id: run
+      uses: google/clusterfuzzlite/actions/run_fuzzers@v1
+      with:
+        github-token: ${{ secrets.GITHUB_TOKEN }}
+        fuzz-seconds: 240
+        mode: 'code-change'
+        report-unreproducible-crashes: false
+        sanitizer: ${{ matrix.sanitizer }}