mirror of
https://github.com/spring-projects/spring-framework.git
synced 2026-09-20 12:19:16 +00:00
Prior to this commit, ConstructorReference.createArray() enforced the MAX_ARRAY_ELEMENTS threshold for multi-dimensional arrays by checking only the product of all dimension sizes, which is equivalent to the total number of leaf-level elements. However, Array.newInstance() allocates a distinct array object at every nesting level, not just at the leaf level. For dimensions [d0, d1, ..., dk-1], the total number of array objects created is 1 + d0 + d0*d1 + ... + d0*d1*...*d(k-2). As a result, an expression such as new int[262143][1][1]...[1], whose trailing dimensions are all 1, kept the leaf-element product just under the threshold while still causing tens of millions of array objects to be allocated. To address that, this commit introduces a second running total, totalArrayObjects, alongside the existing leaf-element product in the multi-dimensional array construction loop. Both totals are checked against MAX_ARRAY_ELEMENTS on every iteration, so array constructions that fan out into an excessive number of array objects are now rejected even when the leaf-element count remains within bounds. Note that SimpleEvaluationContext does not permit array construction in SpEL expressions at all, so this fix effectively only changes behavior for expressions evaluated via StandardEvaluationContext. Tests have been added to ArrayConstructorTests to verify that the new check rejects array constructions with an excessive number of array objects and that array constructions just under the threshold remain unaffected. Closes gh-36998