fix: bsearch prevent overflow on mid calculation

Signed-off-by: Eloy Coto <eloy.coto@acalustra.com>
jqlang · Feb 29, 2024 · 359f0e2 · 359f0e2
1 parent 95cbcc5
commit 359f0e2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/builtin.c b/src/builtin.c
@@ -791,7 +791,7 @@ static jv f_bsearch(jq_state *jq, jv input, jv target) {
   int end = jv_array_length(jv_copy(input));
   jv answer = jv_invalid();
   while (start < end) {
-    int mid = (start + end) / 2;
+    int mid = start + (end - start) / 2;
     int result = jv_cmp(jv_copy(target), jv_array_get(jv_copy(input), mid));
     if (result == 0) {
       answer = jv_number(mid);

diff --git a/tests/jq.test b/tests/jq.test
@@ -1559,6 +1559,10 @@ bsearch({x:1})
 [{ "x": 0 },{ "x": 1 },{ "x": 2 }]
 1
 
+bsearch(0)
+"aa"
+jq: error (at <unknown>): string ("aa") cannot be searched from
+
 # strptime tests are in optional.test
 
 strftime("%Y-%m-%dT%H:%M:%SZ")