From 6c3f626378ae67f2e7daf18cc9f661ba1d83d383 Mon Sep 17 00:00:00 2001 From: Kamil Rytarowski Date: Fri, 31 Aug 2018 08:24:23 +0000 Subject: [PATCH] Improve portability of internal_sysctl() Add an explicit cast from uptr to size_t to prevent potential type mismatch. llvm-svn: 341183 --- compiler-rt/lib/sanitizer_common/sanitizer_linux.cc | 2 +- compiler-rt/lib/sanitizer_common/sanitizer_mac.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_linux.cc b/compiler-rt/lib/sanitizer_common/sanitizer_linux.cc index a269598..978dea5 100644 --- a/compiler-rt/lib/sanitizer_common/sanitizer_linux.cc +++ b/compiler-rt/lib/sanitizer_common/sanitizer_linux.cc @@ -818,7 +818,7 @@ int internal_fork() { #if SANITIZER_FREEBSD || SANITIZER_NETBSD || SANITIZER_OPENBSD int internal_sysctl(const int *name, unsigned int namelen, void *oldp, uptr *oldlenp, const void *newp, uptr newlen) { - return sysctl(name, namelen, oldp, oldlenp, newp, newlen); + return sysctl(name, namelen, oldp, (size_t *)oldlenp, newp, (size_t)newlen); } #endif diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_mac.cc b/compiler-rt/lib/sanitizer_common/sanitizer_mac.cc index a9ee74b..cfc685d 100644 --- a/compiler-rt/lib/sanitizer_common/sanitizer_mac.cc +++ b/compiler-rt/lib/sanitizer_common/sanitizer_mac.cc @@ -215,7 +215,7 @@ int internal_fork() { int internal_sysctl(const int *name, unsigned int namelen, void *oldp, uptr *oldlenp, const void *newp, uptr newlen) { - return sysctl(name, namelen, oldp, oldlenp, newp, newlen); + return sysctl(name, namelen, oldp, (size_t *)oldlenp, newp, (size_t)newlen); } int internal_forkpty(int *amaster) { -- 2.7.4