mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-20 11:40:18 +02:00
Code Activity

Fix hashing of empty vectors.

Browse source 
Fixes a bug introduced in cc1cd04f81
"Fix hashing of vectors to run in bounded time."

* libguile/hash.c (scm_hasher): Avoid division by zero.

* test-suite/tests/hash.test ("hash"): Add tests.
This commit is contained in:
Mark H Weaver 2014-01-12 07:11:44 -05:00
parent f974224d97
commit 63d869e74c
2 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libguile/hash.c
View file

@ -245,7 +245,7 @@ scm_hasher(SCM obj, unsigned long n, size_t d)
{ {
i = len; i = len;
h = n - 1; h = n - 1;
d2 = (d - 1) / len; d2 = len > 0 ? (d - 1) / len : 0;
} }
while (i--) while (i--)

15
test-suite/tests/hash.test
View file

@ -1,6 +1,7 @@
;;;; hash.test --- test guile hashing -*- scheme -*- ;;;; hash.test --- test guile hashing -*- scheme -*-
;;;; ;;;;
;;;; Copyright (C) 2004, 2005, 2006, 2008, 2011, 2012 Free Software Foundation, Inc. ;;;; Copyright (C) 2004, 2005, 2006, 2008, 2011, 2012,
;;;; 2014 Free Software Foundation, Inc.
;;;; ;;;;
;;;; This library is free software; you can redistribute it and/or ;;;; This library is free software; you can redistribute it and/or
;;;; modify it under the terms of the GNU Lesser General Public ;;;; modify it under the terms of the GNU Lesser General Public
@ -36,7 +37,17 @@
(pass-if (= 0 (hash noop 1))) (pass-if (= 0 (hash noop 1)))
(pass-if (= 0 (hash +inf.0 1))) (pass-if (= 0 (hash +inf.0 1)))
(pass-if (= 0 (hash -inf.0 1))) (pass-if (= 0 (hash -inf.0 1)))
(pass-if (= 0 (hash +nan.0 1)))) (pass-if (= 0 (hash +nan.0 1)))
(pass-if (= 0 (hash '#() 1)))
(pass-if "cyclic vectors"
(let ()
(define (cyclic-vector n)
(let ((v (make-vector n)))
(vector-fill! v v)
v))
(and (= 0 (hash (cyclic-vector 3) 1))
(= 0 (hash (cyclic-vector 10) 1))))))
;;; ;;;
;;; hashv ;;; hashv