diff --git a/src/builtin.c b/src/builtin.c index d33e9fb1..2b2a2d40 100644 --- a/src/builtin.c +++ b/src/builtin.c @@ -421,7 +421,10 @@ jv binop_greatereq(jv a, jv b) { static jv f_contains(jq_state *jq, jv a, jv b) { if (jv_get_kind(a) == jv_get_kind(b)) { - return jv_bool(jv_contains(a, b)); + int r = jv_contains(a, b); + if (r < 0) + return jv_invalid_with_msg(jv_string("Containment check too deep")); + return jv_bool(r); } else { return type_error2(a, b, "cannot have their containment checked"); } diff --git a/src/jv.c b/src/jv.c index 607ac174..4b18c00c 100644 --- a/src/jv.c +++ b/src/jv.c @@ -938,19 +938,19 @@ static void jvp_clamp_slice_params(int len, int *pstart, int *pend) } -static int jvp_array_contains(jv a, jv b) { +static int jvp_contains(jv a, jv b, int depth); + +static int jvp_array_contains(jv a, jv b, int depth) { int r = 1; jv_array_foreach(b, bi, belem) { int ri = 0; jv_array_foreach(a, ai, aelem) { - if (jv_contains(aelem, jv_copy(belem))) { - ri = 1; - break; - } + ri = jvp_contains(aelem, jv_copy(belem), depth); + if (ri) break; } jv_free(belem); - if (!ri) { - r = 0; + if (ri <= 0) { + r = ri; break; } } @@ -1844,7 +1844,7 @@ static int jvp_object_equal(jv o1, jv o2) { return len1 == len2; } -static int jvp_object_contains(jv a, jv b) { +static int jvp_object_contains(jv a, jv b, int depth) { assert(JVP_HAS_KIND(a, JV_KIND_OBJECT)); assert(JVP_HAS_KIND(b, JV_KIND_OBJECT)); int r = 1; @@ -1852,9 +1852,9 @@ static int jvp_object_contains(jv a, jv b) { jv_object_foreach(b, key, b_val) { jv a_val = jv_object_get(jv_copy(a), key); - r = jv_contains(a_val, b_val); + r = jvp_contains(a_val, b_val, depth); - if (!r) break; + if (r <= 0) break; } return r; } @@ -2086,14 +2086,23 @@ int jv_identical(jv a, jv b) { return r; } -int jv_contains(jv a, jv b) { +#ifndef MAX_CONTAINS_DEPTH +#define MAX_CONTAINS_DEPTH (10000) +#endif + +static int jvp_contains(jv a, jv b, int depth) { + if (depth > MAX_CONTAINS_DEPTH) { + jv_free(a); + jv_free(b); + return -1; + } int r = 1; if (jv_get_kind(a) != jv_get_kind(b)) { r = 0; } else if (JVP_HAS_KIND(a, JV_KIND_OBJECT)) { - r = jvp_object_contains(a, b); + r = jvp_object_contains(a, b, depth + 1); } else if (JVP_HAS_KIND(a, JV_KIND_ARRAY)) { - r = jvp_array_contains(a, b); + r = jvp_array_contains(a, b, depth + 1); } else if (JVP_HAS_KIND(a, JV_KIND_STRING)) { int b_len = jv_string_length_bytes(jv_copy(b)); if (b_len != 0) { @@ -2109,3 +2118,8 @@ int jv_contains(jv a, jv b) { jv_free(b); return r; } + +// Returns 1 (contained), 0 (not contained), or -1 (too deep) +int jv_contains(jv a, jv b) { + return jvp_contains(a, b, 0); +} diff --git a/tests/jq.test b/tests/jq.test index 0cd5198f..8094a5b6 100644 --- a/tests/jq.test +++ b/tests/jq.test @@ -2593,3 +2593,12 @@ null try delpaths([[range(10001) | 0]]) catch . null "Path too deep" + +# regression test for CVE-2026-40612 +reduce range(10000) as $_ ([]; [.]) | contains([[]]) +null +true + +try (reduce range(10001) as $_ ([]; [.]) as $x | $x | contains($x)) catch . +null +"Containment check too deep"