diff options
| author | Jonathan Gray <jsg@jsg.id.au> | 2015-02-22 19:19:25 +1100 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2015-02-27 23:29:29 +0000 |
| commit | 54cc3cdff4b514cc74dea34bf0824726631e5d64 (patch) | |
| tree | 6e0f383b8903f1d868b4861ef2d001d6c814cf7f | |
| parent | c0f425bb813729ac9b4589c8a717ed27ba5998b9 (diff) | |
auxilary/os: correct sysctl use in os_get_total_physical_memory()
The length argument passed to sysctl was the size of the pointer
not the type. The result of this is sysctl calls would fail on
32 bit BSD/Mac OS X.
Additionally the wrong pointer was passed as an argument to store
the result of the sysctl call.
Cc: "10.4, 10.5" <mesa-stable@lists.freedesktop.org>
Signed-off-by: Jonathan Gray <jsg@jsg.id.au>
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
(cherry picked from commit 7983a3d2e06b0bc16c1a16bddccc7f14fe1f132c)
| -rw-r--r-- | src/gallium/auxiliary/os/os_misc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/auxiliary/os/os_misc.c b/src/gallium/auxiliary/os/os_misc.c index ebf033c99de..c46078bb07d 100644 --- a/src/gallium/auxiliary/os/os_misc.c +++ b/src/gallium/auxiliary/os/os_misc.c @@ -118,7 +118,7 @@ os_get_total_physical_memory(uint64_t *size) *size = phys_pages * page_size; return (phys_pages > 0 && page_size > 0); #elif defined(PIPE_OS_APPLE) || defined(PIPE_OS_BSD) - size_t len = sizeof(size); + size_t len = sizeof(*size); int mib[2]; mib[0] = CTL_HW; @@ -134,7 +134,7 @@ os_get_total_physical_memory(uint64_t *size) #error Unsupported *BSD #endif - return (sysctl(mib, 2, &size, &len, NULL, 0) == 0); + return (sysctl(mib, 2, size, &len, NULL, 0) == 0); #elif defined(PIPE_OS_HAIKU) system_info info; status_t ret; |