Merge branch 'master' into dependabot/github_actions/actions/checkout-5

Author: lemire

.github/workflows/cifuzz.yml

@@ -19,7 +19,7 @@ jobs:
         fuzz-seconds: 300
         dry-run: false
     - name: Upload Crash
-      uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
+      uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
       if: failure() && steps.build.outcome == 'success'
       with:
         name: artifacts

.github/workflows/clang-format.yml

@@ -8,7 +8,7 @@ jobs:
 
     steps:
     - uses: actions/checkout@v5
-    - uses: DoozyX/clang-format-lint-action@v0.18
+    - uses: DoozyX/clang-format-lint-action@v0.20
       with:
         source: '.'
         exclude: './cmake'

.github/workflows/codeql.yml

@@ -30,15 +30,15 @@ jobs:
         uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v3.5.2
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5
+        uses: github/codeql-action/init@2d92b76c45b91eb80fc44c74ce3fce0ee94e8f9d # v3.30.0
         with:
           languages: ${{ matrix.language }}
 
       - name: Autobuild
-        uses: github/codeql-action/autobuild@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5
+        uses: github/codeql-action/autobuild@2d92b76c45b91eb80fc44c74ce3fce0ee94e8f9d # v3.30.0
         if: ${{ matrix.language == 'cpp' || matrix.language == 'python' }}
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5
+        uses: github/codeql-action/analyze@2d92b76c45b91eb80fc44c74ce3fce0ee94e8f9d # v3.30.0
         with:
           category: "/language:${{ matrix.language }}"

.github/workflows/scorecard.yml

@@ -37,7 +37,7 @@ jobs:
           persist-credentials: false
 
       - name: "Run analysis"
-        uses: ossf/scorecard-action@62b2cac7ed8198b15735ed49ab1e5cf35480ba46 # v2.4.0
+        uses: ossf/scorecard-action@05b42c624433fc40578a4040d5cf5e36ddca8cde # v2.4.2
         with:
           results_file: results.sarif
           results_format: sarif
@@ -59,14 +59,14 @@ jobs:
       # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
       # format to the repository Actions tab.
       - name: "Upload artifact"
-        uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: SARIF file
           path: results.sarif
           retention-days: 5
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v2.15.1
+        uses: github/codeql-action/upload-sarif@2d92b76c45b91eb80fc44c74ce3fce0ee94e8f9d # v2.15.1
         with:
           sarif_file: results.sarif

microbenchmarks/synthetic_bench.cpp

@@ -1,7 +1,7 @@
+#include <array>
 #include <benchmark/benchmark.h>
 #include <random>
 #include <set>
-#include <array>
 
 #include "performancecounters/event_counter.h"
 #include "roaring/roaring64.h"

src/roaring.c

@@ -1596,7 +1596,7 @@ roaring_bitmap_t *roaring_bitmap_deserialize_safe(const void *buf,
         for (uint32_t i = 0; i < card; i++) {
             // elems may not be aligned, read with memcpy
             uint32_t elem;
-            memcpy((char*)&elem, (char*)(elems + i), sizeof(elem));
+            memcpy((char *)&elem, (char *)(elems + i), sizeof(elem));
             roaring_bitmap_add_bulk(bitmap, &context, elem);
         }
         return bitmap;
@@ -3016,7 +3016,7 @@ void roaring_bitmap_frozen_serialize(const roaring_bitmap_t *rb, char *buf) {
     uint16_t *key_zone = (uint16_t *)arena_alloc(&buf, 2 * ra->size);
     uint16_t *count_zone = (uint16_t *)arena_alloc(&buf, 2 * ra->size);
     uint8_t *typecode_zone = (uint8_t *)arena_alloc(&buf, ra->size);
-    char *header_zone = (char*)arena_alloc(&buf, 4);
+    char *header_zone = (char *)arena_alloc(&buf, 4);
 
     for (int32_t i = 0; i < ra->size; i++) {
         uint16_t count;

src/roaring64.c

@@ -2707,6 +2707,8 @@ uint64_t roaring64_iterator_read(roaring64_iterator_t *it, uint64_t *buf,
         it->has_value = art_iterator_next(&it->art_it);
         if (it->has_value) {
             roaring64_iterator_init_at_leaf_first(it);
+        } else {
+            it->saturated_forward = true;
         }
     }
     return consumed;

tests/roaring64_unit.cpp

@@ -1974,6 +1974,32 @@ DEFINE_TEST(test_stats) {
     roaring64_bitmap_free(r1);
 }
 
+DEFINE_TEST(test_iterator_read_past_end_can_go_previous) {
+    roaring64_bitmap_t* bitmap = roaring64_bitmap_create();
+    assert_non_null(bitmap);
+
+    roaring64_bitmap_add(bitmap, 10);
+    assert_r64_valid(bitmap);
+
+    roaring64_iterator_t* iter = roaring64_iterator_create(bitmap);
+    assert_non_null(iter);
+
+    uint64_t buffer[100];
+    uint64_t actual_read1 = roaring64_iterator_read(
+        iter, buffer, sizeof(buffer) / sizeof(buffer[0]));
+    assert_int_equal(actual_read1, 1);  // Only one value should be present
+
+    // Should now be one past the end, but should be able to move backwards
+    assert_false(roaring64_iterator_has_value(iter));
+    bool prev_result = roaring64_iterator_previous(iter);
+    assert_true(prev_result);
+    assert_true(roaring64_iterator_has_value(iter));
+    assert_int_equal(roaring64_iterator_value(iter), 10);
+
+    roaring64_iterator_free(iter);
+    roaring64_bitmap_free(bitmap);
+}
+
 }  // namespace
 
 int main() {
@@ -2038,6 +2064,7 @@ int main() {
         cmocka_unit_test(test_iterator_move_equalorlarger),
         cmocka_unit_test(test_iterator_read),
         cmocka_unit_test(test_stats),
+        cmocka_unit_test(test_iterator_read_past_end_can_go_previous),
     };
     return cmocka_run_group_tests(tests, NULL, NULL);
 }