Merge pull request #4339
92a6220
sanity: hook up sanity checks (Cory Fields)679240d
sanity: add libc/stdlib sanity checks (Cory Fields)11404af
sanity: autoconf check for sys/select.h (Cory Fields)
This commit is contained in:
commit
b8e56aa8ef
6 changed files with 137 additions and 4 deletions
|
@ -368,7 +368,7 @@ if test x$TARGET_OS = xdarwin; then
|
||||||
AX_CHECK_LINK_FLAG([[-Wl,-dead_strip]], [LDFLAGS="$LDFLAGS -Wl,-dead_strip"])
|
AX_CHECK_LINK_FLAG([[-Wl,-dead_strip]], [LDFLAGS="$LDFLAGS -Wl,-dead_strip"])
|
||||||
fi
|
fi
|
||||||
|
|
||||||
AC_CHECK_HEADERS([stdio.h stdlib.h unistd.h strings.h sys/types.h sys/stat.h])
|
AC_CHECK_HEADERS([stdio.h stdlib.h unistd.h strings.h sys/types.h sys/stat.h sys/select.h])
|
||||||
|
|
||||||
dnl Check for MSG_NOSIGNAL
|
dnl Check for MSG_NOSIGNAL
|
||||||
AC_MSG_CHECKING(for MSG_NOSIGNAL)
|
AC_MSG_CHECKING(for MSG_NOSIGNAL)
|
||||||
|
|
|
@ -85,7 +85,8 @@ BITCOIN_CORE_H = \
|
||||||
util.h \
|
util.h \
|
||||||
version.h \
|
version.h \
|
||||||
walletdb.h \
|
walletdb.h \
|
||||||
wallet.h
|
wallet.h \
|
||||||
|
compat/sanity.h
|
||||||
|
|
||||||
JSON_H = \
|
JSON_H = \
|
||||||
json/json_spirit.h \
|
json/json_spirit.h \
|
||||||
|
@ -154,6 +155,8 @@ libbitcoin_common_a_SOURCES = \
|
||||||
sync.cpp \
|
sync.cpp \
|
||||||
util.cpp \
|
util.cpp \
|
||||||
version.cpp \
|
version.cpp \
|
||||||
|
compat/glibc_sanity.cpp \
|
||||||
|
compat/glibcxx_sanity.cpp \
|
||||||
$(BITCOIN_CORE_H)
|
$(BITCOIN_CORE_H)
|
||||||
|
|
||||||
if GLIBC_BACK_COMPAT
|
if GLIBC_BACK_COMPAT
|
||||||
|
|
61
src/compat/glibc_sanity.cpp
Normal file
61
src/compat/glibc_sanity.cpp
Normal file
|
@ -0,0 +1,61 @@
|
||||||
|
#include "bitcoin-config.h"
|
||||||
|
|
||||||
|
#include <cstddef>
|
||||||
|
#if defined(HAVE_SYS_SELECT_H)
|
||||||
|
#include <sys/select.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
extern "C" void* memcpy(void* a, const void* b, size_t c);
|
||||||
|
void* memcpy_int(void* a, const void* b, size_t c)
|
||||||
|
{
|
||||||
|
return memcpy(a,b,c);
|
||||||
|
}
|
||||||
|
|
||||||
|
namespace {
|
||||||
|
// trigger: Use the memcpy_int wrapper which calls our internal memcpy.
|
||||||
|
// A direct call to memcpy may be optimized away by the compiler.
|
||||||
|
// test: Fill an array with a sequence of integers. memcpy to a new empty array.
|
||||||
|
// Verify that the arrays are equal. Use an odd size to decrease the odds of
|
||||||
|
// the call being optimized away.
|
||||||
|
template <unsigned int T>
|
||||||
|
bool sanity_test_memcpy()
|
||||||
|
{
|
||||||
|
unsigned int memcpy_test[T];
|
||||||
|
unsigned int memcpy_verify[T] = {};
|
||||||
|
for (unsigned int i = 0; i != T; ++i)
|
||||||
|
memcpy_test[i] = i;
|
||||||
|
|
||||||
|
memcpy_int(memcpy_verify,memcpy_test,sizeof(memcpy_test));
|
||||||
|
|
||||||
|
for (unsigned int i = 0; i != T; ++i)
|
||||||
|
{
|
||||||
|
if(memcpy_verify[i] != i)
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
#if defined(HAVE_SYS_SELECT_H)
|
||||||
|
// trigger: Call FD_SET to trigger __fdelt_chk. FORTIFY_SOURCE must be defined
|
||||||
|
// as >0 and optimizations must be set to at least -O2.
|
||||||
|
// test: Add a file descriptor to an empty fd_set. Verify that it has been
|
||||||
|
// correctly added.
|
||||||
|
bool sanity_test_fdelt()
|
||||||
|
{
|
||||||
|
fd_set fds;
|
||||||
|
FD_ZERO(&fds);
|
||||||
|
FD_SET(0, &fds);
|
||||||
|
return FD_ISSET(0,&fds);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
} // anon namespace
|
||||||
|
|
||||||
|
bool glibc_sanity_test()
|
||||||
|
{
|
||||||
|
#if defined(HAVE_SYS_SELECT_H)
|
||||||
|
if (!sanity_test_fdelt())
|
||||||
|
return false;
|
||||||
|
#endif
|
||||||
|
return sanity_test_memcpy<1025>();
|
||||||
|
}
|
61
src/compat/glibcxx_sanity.cpp
Normal file
61
src/compat/glibcxx_sanity.cpp
Normal file
|
@ -0,0 +1,61 @@
|
||||||
|
#include <locale>
|
||||||
|
#include <list>
|
||||||
|
#include <stdexcept>
|
||||||
|
|
||||||
|
namespace{
|
||||||
|
|
||||||
|
// trigger: use ctype<char>::widen to trigger ctype<char>::_M_widen_init().
|
||||||
|
// test: convert a char from narrow to wide and back. Verify that the result
|
||||||
|
// matches the original.
|
||||||
|
bool sanity_test_widen(char testchar)
|
||||||
|
{
|
||||||
|
const std::ctype<char>& test(std::use_facet< std::ctype<char> >(std::locale()));
|
||||||
|
return test.narrow(test.widen(testchar),'b') == testchar;
|
||||||
|
}
|
||||||
|
|
||||||
|
// trigger: use list::push_back and list::pop_back to trigger _M_hook and
|
||||||
|
// _M_unhook.
|
||||||
|
// test: Push a sequence of integers into a list. Pop them off and verify that
|
||||||
|
// they match the original sequence.
|
||||||
|
bool sanity_test_list(unsigned int size)
|
||||||
|
{
|
||||||
|
std::list<unsigned int> test;
|
||||||
|
for (unsigned int i = 0; i != size; ++i)
|
||||||
|
test.push_back(i+1);
|
||||||
|
|
||||||
|
if (test.size() != size)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
while (!test.empty())
|
||||||
|
{
|
||||||
|
if(test.back() != test.size())
|
||||||
|
return false;
|
||||||
|
test.pop_back();
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
} // anon namespace
|
||||||
|
|
||||||
|
// trigger: string::at(x) on an empty string to trigger __throw_out_of_range_fmt.
|
||||||
|
// test: force std::string to throw an out_of_range exception. Verify that
|
||||||
|
// it's caught correctly.
|
||||||
|
bool sanity_test_range_fmt()
|
||||||
|
{
|
||||||
|
std::string test;
|
||||||
|
try
|
||||||
|
{
|
||||||
|
test.at(1);
|
||||||
|
}
|
||||||
|
catch (const std::out_of_range&)
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
catch (...){}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool glibcxx_sanity_test()
|
||||||
|
{
|
||||||
|
return sanity_test_widen('a') && sanity_test_list(100) && sanity_test_range_fmt();
|
||||||
|
}
|
7
src/compat/sanity.h
Normal file
7
src/compat/sanity.h
Normal file
|
@ -0,0 +1,7 @@
|
||||||
|
#ifndef BITCON_COMPAT_SANITY_H
|
||||||
|
#define BITCON_COMPAT_SANITY_H
|
||||||
|
|
||||||
|
bool glibc_sanity_test();
|
||||||
|
bool glibcxx_sanity_test();
|
||||||
|
|
||||||
|
#endif
|
|
@ -31,6 +31,7 @@
|
||||||
#ifndef WIN32
|
#ifndef WIN32
|
||||||
#include <signal.h>
|
#include <signal.h>
|
||||||
#endif
|
#endif
|
||||||
|
#include "compat/sanity.h"
|
||||||
|
|
||||||
#include <boost/algorithm/string/predicate.hpp>
|
#include <boost/algorithm/string/predicate.hpp>
|
||||||
#include <boost/filesystem.hpp>
|
#include <boost/filesystem.hpp>
|
||||||
|
@ -424,8 +425,8 @@ bool InitSanityCheck(void)
|
||||||
"information, visit https://en.bitcoin.it/wiki/OpenSSL_and_EC_Libraries");
|
"information, visit https://en.bitcoin.it/wiki/OpenSSL_and_EC_Libraries");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
if (!glibc_sanity_test() || !glibcxx_sanity_test())
|
||||||
// TODO: remaining sanity checks, see #4081
|
return false;
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue