project-base/server-skynet-source-3rd-jemalloc
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix dangerous casts in tests.

Browse Source 
Fix dangerous casts of int variables to pointers in thread join function
calls.  On LP64 systems, int and pointers are different sizes, so
writes can corrupt memory.
This commit is contained in:
Jason Evans 2013-10-20 14:07:18 -07:00
parent dda90f59e2
commit 8edaf86b67
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/allocated.c
View File

@ -104,12 +104,12 @@ main(void)
je_thread_start(NULL); je_thread_start(NULL);
je_thread_create(&thread, je_thread_start, NULL); je_thread_create(&thread, je_thread_start, NULL);
je_thread_join(thread, (void *)&ret); je_thread_join(thread, NULL);
je_thread_start(NULL); je_thread_start(NULL);
je_thread_create(&thread, je_thread_start, NULL); je_thread_create(&thread, je_thread_start, NULL);
je_thread_join(thread, (void *)&ret); je_thread_join(thread, NULL);
je_thread_start(NULL); je_thread_start(NULL);

8
test/thread_arena.c
View File

@ -72,8 +72,12 @@ main(void)
(void *)&arena_ind); (void *)&arena_ind);
} }
for (i = 0; i < NTHREADS; i++) for (i = 0; i < NTHREADS; i++) {
je_thread_join(threads[i], (void *)&ret); intptr_t join_ret;
je_thread_join(threads[i], (void *)&join_ret);
if (join_ret != 0)
ret = 1;
}
label_return: label_return:
malloc_printf("Test end\n"); malloc_printf("Test end\n");

4
test/thread_tcache_enabled.c
View File

@ -77,12 +77,12 @@ main(void)
je_thread_start(NULL); je_thread_start(NULL);
je_thread_create(&thread, je_thread_start, NULL); je_thread_create(&thread, je_thread_start, NULL);
je_thread_join(thread, (void *)&ret); je_thread_join(thread, NULL);
je_thread_start(NULL); je_thread_start(NULL);
je_thread_create(&thread, je_thread_start, NULL); je_thread_create(&thread, je_thread_start, NULL);
je_thread_join(thread, (void *)&ret); je_thread_join(thread, NULL);
je_thread_start(NULL); je_thread_start(NULL);