]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merged revisions 221971 via svnmerge from
authorTilghman Lesher <tilghman@meg.abyt.es>
Fri, 2 Oct 2009 17:00:52 +0000 (17:00 +0000)
committerTilghman Lesher <tilghman@meg.abyt.es>
Fri, 2 Oct 2009 17:00:52 +0000 (17:00 +0000)
https://origsvn.digium.com/svn/asterisk/trunk

................
  r221971 | tilghman | 2009-10-02 11:59:57 -0500 (Fri, 02 Oct 2009) | 9 lines

  Merged revisions 221970 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.4

  ........
    r221970 | tilghman | 2009-10-02 11:58:03 -0500 (Fri, 02 Oct 2009) | 2 lines

    Ensure the result of the hash function is positive.  Negative array offsets suck.
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@221972 65c4cc65-6c06-0410-ace0-fbb531ad65f3

main/astobj2.c

index f67e18868346eff0d0626f7ededc4d4ca00943a7..4603b73ac55d6432696119e7ba6a00fd7663f66c 100644 (file)
@@ -395,7 +395,7 @@ void *ao2_link(struct ao2_container *c, void *user_data)
        if (!p)
                return NULL;
 
-       i = c->hash_fn(user_data, OBJ_POINTER);
+       i = abs(c->hash_fn(user_data, OBJ_POINTER));
 
        ao2_lock(c);
        i %= c->n_buckets;