mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-14 06:59:53 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

core: Replace PA_PAGE_SIZE with pa_page_size()

Browse source 
PA_PAGE_SIZE using sysconf() may return a negative number

CID 1137925, CID 1137926, CID 1138485

instead of calling sysconf() directly, add function pa_page_size()
which uses the guestimate 4096 in case sysconf(_SC_PAGE_SIZE) fails

using PA_ONCE to only evaluate sysconf() once
This commit is contained in:
Peter Meerwald-Stadler 2016-08-18 01:06:47 +02:00
parent c99efbffd6
commit 45d9030638
10 changed files with 55 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/tests/sigbus-test.c
View file

@ -33,6 +33,7 @@ START_TEST (sigbus_test) {
void *p;
int fd;
pa_memtrap *m;
const size_t page_size = pa_page_size();
pa_log_set_level(PA_LOG_DEBUG);
pa_memtrap_install();
@ -40,14 +41,14 @@ START_TEST (sigbus_test) {
/* Create the memory map */
fail_unless((fd = open("sigbus-test-map", O_RDWR|O_TRUNC|O_CREAT, 0660)) >= 0);
fail_unless(unlink("sigbus-test-map") == 0);
fail_unless(ftruncate(fd, PA_PAGE_SIZE) >= 0);
fail_unless((p = mmap(NULL, PA_PAGE_SIZE, PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0)) != MAP_FAILED);
fail_unless(ftruncate(fd, page_size) >= 0);
fail_unless((p = mmap(NULL, page_size, PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0)) != MAP_FAILED);
/* Register memory map */
m = pa_memtrap_add(p, PA_PAGE_SIZE);
m = pa_memtrap_add(p, page_size);
/* Use memory map */
pa_snprintf(p, PA_PAGE_SIZE, "This is a test that should work fine.");
pa_snprintf(p, page_size, "This is a test that should work fine.");
/* Verify memory map */
pa_log("Let's see if this worked: %s", (char*) p);
@ -58,7 +59,7 @@ START_TEST (sigbus_test) {
fail_unless(ftruncate(fd, 0) >= 0);
/* Use memory map */
pa_snprintf(p, PA_PAGE_SIZE, "This is a test that should fail but get caught.");
pa_snprintf(p, page_size, "This is a test that should fail but get caught.");
/* Verify memory map */
pa_log("Let's see if this worked: %s", (char*) p);
@ -66,7 +67,7 @@ START_TEST (sigbus_test) {
fail_unless(pa_memtrap_is_good(m) == false);
pa_memtrap_remove(m);
munmap(p, PA_PAGE_SIZE);
munmap(p, page_size);
close(fd);
}
END_TEST