Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit777456f

Browse files
committed
CLJ-2839 Infinite seq class hashCode() is infinite loop
1 parentce55092 commit777456f

File tree

6 files changed

+50
-2
lines changed

6 files changed

+50
-2
lines changed

‎src/clj/clojure/core.clj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3028,7 +3028,8 @@
30283028
[n x] (take n (repeat x)))
30293029

30303030
(defniterate
3031-
"Returns a lazy sequence of x, (f x), (f (f x)) etc. f must be free of side-effects"
3031+
"Returns a lazy (infinite!) sequence of x, (f x), (f (f x)) etc.
3032+
f must be free of side-effects"
30323033
{:added"1.0"
30333034
:statictrue}
30343035
[f x] (clojure.lang.Iterate/create f x) )

‎src/jvm/clojure/lang/Cycle.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,4 +93,13 @@ public Object reduce(IFn f, Object start){
9393
s =all;
9494
}
9595
}
96+
97+
publicinthashCode(){
98+
thrownewUnsupportedOperationException();
99+
}
100+
101+
publicinthasheq(){
102+
thrownewUnsupportedOperationException();
103+
}
104+
96105
}

‎src/jvm/clojure/lang/Iterate.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,4 +84,12 @@ public Object reduce(IFn rf, Object start){
8484
v =f.invoke(v);
8585
}
8686
}
87+
88+
publicinthashCode(){
89+
thrownewUnsupportedOperationException();
90+
}
91+
92+
publicinthasheq(){
93+
thrownewUnsupportedOperationException();
94+
}
8795
}

‎src/jvm/clojure/lang/Repeat.java

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,4 +97,17 @@ public Object reduce(IFn f, Object start){
9797
}
9898
}
9999

100+
publicinthashCode(){
101+
if(count <=0)
102+
thrownewUnsupportedOperationException();
103+
else
104+
returnsuper.hashCode();
105+
}
106+
107+
publicinthasheq(){
108+
if(count <=0)
109+
thrownewUnsupportedOperationException();
110+
else
111+
returnsuper.hasheq();
112+
}
100113
}

‎test/clojure/test_clojure/sequences.clj

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1458,6 +1458,16 @@
14581458
:kf #(some-> %:k #{012})
14591459
:vf:item))))))
14601460

1461+
(deftestinfinite-seq-hash
1462+
(are [e] (thrown? Exception (.hashCode ^Object e))
1463+
(iterate identitynil)
1464+
(cycle [1])
1465+
(repeat1))
1466+
(are [e] (thrown? Exception (.hasheq ^clojure.lang.IHashEq e))
1467+
(iterate identitynil)
1468+
(cycle [1])
1469+
(repeat1)))
1470+
14611471
(defspeciteration-seq-equals-reduce1000
14621472
(prop/for-all [initk gen/int
14631473
seed gen/int]

‎test/clojure/test_clojure/serialization.clj

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,4 +183,11 @@
183183

184184
;; stateful seqs
185185
(enumeration-seq (java.util.Collections/enumeration (range50)))
186-
(iterator-seq (.iterator (range50)))))
186+
(iterator-seq (.iterator (range50)))))
187+
188+
;; necessary for CVE-2024-22871
189+
(deftestCLJ-2839
190+
(are [e] (thrown? Exception (.hashCode ^Object (-> e serialize deserialize)))
191+
(repeat1)
192+
(iterate identitynil)
193+
(cycle [1])))

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp