jory/upx
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Use calloc instead of malloc to pacify valgrind.

Browse Source
This commit is contained in:
Markus F.X.J. Oberhumer
2016-09-28 21:30:38 +02:00
parent b0841268bd
commit e41c475671
3 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/travis_testsuite_1.sh
+4 -1
View File
@@ -79,7 +79,10 @@ if [[ $TRAVIS_OS_NAME == osx ]]; then
fi fi
upx=$PWD/upx.out upx=$PWD/upx.out
if [[ $B =~ (^|\+)valgrind($|\+) ]]; then if [[ $B =~ (^|\+)valgrind($|\+) ]]; then
upx="valgrind --leak-check=full --show-reachable=yes $upx" valgrind_flags="--leak-check=full --show-reachable=yes"
valgrind_flags="-q --leak-check=no --error-exitcode=1"
valgrind_flags="--leak-check=no --error-exitcode=1"
upx="valgrind $valgrind_flags $upx"
fi fi
upx_391= upx_391=
if [[ $TRAVIS_OS_NAME == linux ]]; then if [[ $TRAVIS_OS_NAME == linux ]]; then
.github/travis_testsuite_2.sh
+4 -1
View File
@@ -29,7 +29,10 @@ if [[ $TRAVIS_OS_NAME == osx ]]; then
fi fi
upx=$PWD/upx.out upx=$PWD/upx.out
if [[ $B =~ (^|\+)valgrind($|\+) ]]; then if [[ $B =~ (^|\+)valgrind($|\+) ]]; then
upx="valgrind --leak-check=full --show-reachable=yes $upx" valgrind_flags="--leak-check=full --show-reachable=yes"
valgrind_flags="-q --leak-check=no --error-exitcode=1"
valgrind_flags="--leak-check=no --error-exitcode=1"
upx="valgrind $valgrind_flags $upx"
fi fi
upx_391= upx_391=
if [[ $TRAVIS_OS_NAME == linux ]]; then if [[ $TRAVIS_OS_NAME == linux ]]; then
src/compress_ucl.cpp
+6
View File
@@ -281,6 +281,11 @@ int upx_ucl_test_overlap ( const upx_bytep buf,
// misc // misc
**************************************************************************/ **************************************************************************/
extern "C" {
static ucl_voidp __UCL_CDECL my_malloc(ucl_uint n) { return calloc(1, n); }
static void __UCL_CDECL my_free(ucl_voidp p) { free(p); }
}
int upx_ucl_init(void) int upx_ucl_init(void)
{ {
if (ucl_init() != UCL_E_OK) if (ucl_init() != UCL_E_OK)
@@ -289,6 +294,7 @@ int upx_ucl_init(void)
if (UCL_VERSION != ucl_version()) if (UCL_VERSION != ucl_version())
return -2; return -2;
#endif #endif
ucl_set_malloc_hooks(my_malloc, my_free);
return 0; return 0;
} }