Changeset 1308 for pjproject/branches/pjproject-0.5-stable/pjlib/src/pj/hash.c

Timestamp:

May 28, 2007 12:01:51 PM (17 years ago)

Author:

bennylp

Message:

Fixed ticket #305: Memory alignment error for hash entry buffer causing crash on ARM (thanks ChenHuan?)

File:

• pjproject/branches/pjproject-0.5-stable/pjlib/src/pj/hash.c (modified) (2 diffs)

pjproject/branches/pjproject-0.5-stable/pjlib/src/pj/hash.c

@@ -101 +101 @@
     unsigned table_size;
     
-    /* Check that PJ_HASH_ENTRY_SIZE is correct. */
-    PJ_ASSERT_RETURN(sizeof(pj_hash_entry)==PJ_HASH_ENTRY_SIZE, NULL);
+    /* Check that PJ_HASH_ENTRY_BUF_SIZE is correct. */
+    PJ_ASSERT_RETURN(sizeof(pj_hash_entry)<=PJ_HASH_ENTRY_BUF_SIZE, NULL);
 
     h = pj_pool_alloc(pool, sizeof(pj_hash_table_t));
@@ -237 +237 @@
 PJ_DEF(void) pj_hash_set_np( pj_hash_table_t *ht,
                              const void *key, unsigned keylen, 
-                             pj_uint32_t hval, void *entry_buf, void *value)
+                             pj_uint32_t hval, pj_hash_entry_buf entry_buf, 
+                             void *value)
 {
     pj_hash_entry **p_entry;
 
-    p_entry = find_entry( NULL, ht, key, keylen, value, &hval, entry_buf );
+    p_entry = find_entry( NULL, ht, key, keylen, value, &hval, 
+                         (void*)entry_buf );
     if (*p_entry) {
         if (value == NULL) {