Changeset 2138

Timestamp:

Jul 14, 2008 4:58:11 PM (16 years ago)

Author:

bennylp

Message:

Ticket #568: The hash table ignores the last row of the table in hash table iteration, causing some memory leaks during shutdown routine because some objects are not destroyed

Location:

pjproject/trunk/pjlib

Files:

• build/Makefile (modified) (1 diff)
• src/pj/hash.c (modified) (3 diffs)
• src/pjlib-test/hash_test.c (added)
• src/pjlib-test/test.c (modified) (1 diff)
• src/pjlib-test/test.h (modified) (2 diffs)

pjproject/trunk/pjlib/build/Makefile

@@ -34 +34 @@
 export TEST_SRCDIR = ../src/pjlib-test
 export TEST_OBJS += activesock.o atomic.o echo_clt.o errno.o exception.o \
-                    fifobuf.o file.o ioq_perf.o ioq_udp.o ioq_unreg.o \
-                    ioq_tcp.o \
+                    fifobuf.o file.o hash_test.o ioq_perf.o ioq_udp.o \
+                    ioq_unreg.o ioq_tcp.o \
                     list.o mutex.o os.o pool.o pool_perf.o rand.o rbtree.o \
                     select.o sleep.o sock.o sock_perf.o \

pjproject/trunk/pjlib/src/pj/hash.c

@@ -277 +277 @@
     it->entry = NULL;
 
-    for (; it->index < ht->rows; ++it->index) {
+    for (; it->index <= ht->rows; ++it->index) {
         it->entry = ht->table[it->index];
         if (it->entry) {
@@ -295 +295 @@
     }
 
-    for (++it->index; it->index < ht->rows; ++it->index) {
+    for (++it->index; it->index <= ht->rows; ++it->index) {
         it->entry = ht->table[it->index];
         if (it->entry) {
@@ -320 +320 @@
     int len, totlen = 0;
 
-    for (i=0; i<ht->rows; ++i) {
+    for (i=0; i<=ht->rows; ++i) {
         unsigned count = 0;    
         pj_hash_entry *entry = ht->table[i];

pjproject/trunk/pjlib/src/pjlib-test/test.c

@@ -103 +103 @@
 #endif
 
+#if INCLUDE_HASH_TEST
+    DO_TEST( hash_test() );
+#endif
+
 #if INCLUDE_TIMESTAMP_TEST
     DO_TEST( timestamp_test() );

pjproject/trunk/pjlib/src/pjlib-test/test.h

@@ -37 +37 @@
 #define INCLUDE_RAND_TEST           GROUP_LIBC
 #define INCLUDE_LIST_TEST           GROUP_DATA_STRUCTURE
+#define INCLUDE_HASH_TEST           GROUP_DATA_STRUCTURE
 #define INCLUDE_POOL_TEST           GROUP_LIBC
 #define INCLUDE_POOL_PERF_TEST      GROUP_LIBC
@@ -75 +76 @@
 extern int rand_test(void);
 extern int list_test(void);
+extern int hash_test(void);
 extern int pool_test(void);
 extern int pool_perf_test(void);