Cypher_Stack/libsecret
2
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libsecret.git synced 2024-12-22 20:58:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

build-sys: Update valgrind headers

Browse Source 
libsecret ships headers from valgrind, but they seem to come from an old
version. Update to the headers from valgrind-3.11.0-1.fc23.x86_64
in order to get VG_DO_ADDED_LEAK_CHECK definition.

https://bugzilla.gnome.org/show_bug.cgi?id=756766
This commit is contained in:
Christophe Fergeau 2015-07-25 14:44:13 +02:00
parent b8bd3d0de8
commit 20f35bfd92
3 changed files with 3781 additions and 1980 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
build/valgrind/memcheck.h
View File

@ -13,7 +13,7 @@
This file is part of MemCheck, a heavyweight Valgrind tool for This file is part of MemCheck, a heavyweight Valgrind tool for
detecting memory errors. detecting memory errors.
Copyright (C) 2000-2010 Julian Seward. All rights reserved. Copyright (C) 2000-2015 Julian Seward. All rights reserved.
Redistribution and use in source and binary forms, with or without Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions modification, are permitted provided that the following conditions
@ -71,12 +71,6 @@
#include "valgrind.h" #include "valgrind.h"
#if defined(__GNUC__)
# define VG_UNUSED __attribute__((unused))
#else
# define VG_UNUSED
#endif
/* !! ABIWARNING !! ABIWARNING !! ABIWARNING !! ABIWARNING !! /* !! ABIWARNING !! ABIWARNING !! ABIWARNING !! ABIWARNING !!
This enum comprises an ABI exported by Valgrind to programs This enum comprises an ABI exported by Valgrind to programs
which use client requests. DO NOT CHANGE THE ORDER OF THESE which use client requests. DO NOT CHANGE THE ORDER OF THESE
@ -102,6 +96,9 @@ typedef
/* Not next to VG_USERREQ__COUNT_LEAKS because it was added later. */ /* Not next to VG_USERREQ__COUNT_LEAKS because it was added later. */
VG_USERREQ__COUNT_LEAK_BLOCKS, VG_USERREQ__COUNT_LEAK_BLOCKS,
VG_USERREQ__ENABLE_ADDR_ERROR_REPORTING_IN_RANGE,
VG_USERREQ__DISABLE_ADDR_ERROR_REPORTING_IN_RANGE,
/* This is just for memcheck's internal use - don't use it */ /* This is just for memcheck's internal use - don't use it */
_VG_USERREQ__MEMCHECK_RECORD_OVERLAP_ERROR _VG_USERREQ__MEMCHECK_RECORD_OVERLAP_ERROR
= VG_USERREQ_TOOL_BASE('M','C') + 256 = VG_USERREQ_TOOL_BASE('M','C') + 256
@ -190,19 +187,27 @@ typedef
/* Do a full memory leak check (like --leak-check=full) mid-execution. */ /* Do a full memory leak check (like --leak-check=full) mid-execution. */
#define VALGRIND_DO_LEAK_CHECK \ #define VALGRIND_DO_LEAK_CHECK \
{unsigned long _qzz_res VG_UNUSED; \ VALGRIND_DO_CLIENT_REQUEST_STMT(VG_USERREQ__DO_LEAK_CHECK, \
VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0, \ 0, 0, 0, 0, 0)
VG_USERREQ__DO_LEAK_CHECK, \
0, 0, 0, 0, 0); \ /* Same as VALGRIND_DO_LEAK_CHECK but only showing the entries for
} which there was an increase in leaked bytes or leaked nr of blocks
since the previous leak search. */
#define VALGRIND_DO_ADDED_LEAK_CHECK \
VALGRIND_DO_CLIENT_REQUEST_STMT(VG_USERREQ__DO_LEAK_CHECK, \
0, 1, 0, 0, 0)
/* Same as VALGRIND_DO_ADDED_LEAK_CHECK but showing entries with
increased or decreased leaked bytes/blocks since previous leak
search. */
#define VALGRIND_DO_CHANGED_LEAK_CHECK \
VALGRIND_DO_CLIENT_REQUEST_STMT(VG_USERREQ__DO_LEAK_CHECK, \
0, 2, 0, 0, 0)
/* Do a summary memory leak check (like --leak-check=summary) mid-execution. */ /* Do a summary memory leak check (like --leak-check=summary) mid-execution. */
#define VALGRIND_DO_QUICK_LEAK_CHECK \ #define VALGRIND_DO_QUICK_LEAK_CHECK \
{unsigned long _qzz_res; \ VALGRIND_DO_CLIENT_REQUEST_STMT(VG_USERREQ__DO_LEAK_CHECK, \
VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0, \ 1, 0, 0, 0, 0)
VG_USERREQ__DO_LEAK_CHECK, \
1, 0, 0, 0, 0); \
}
/* Return number of leaked, dubious, reachable and suppressed bytes found by /* Return number of leaked, dubious, reachable and suppressed bytes found by
all previous leak checks. They must be lvalues. */ all previous leak checks. They must be lvalues. */
@ -213,10 +218,10 @@ typedef
are. We also initialise '_qzz_leaked', etc because are. We also initialise '_qzz_leaked', etc because
VG_USERREQ__COUNT_LEAKS doesn't mark the values returned as VG_USERREQ__COUNT_LEAKS doesn't mark the values returned as
defined. */ \ defined. */ \
{unsigned long _qzz_res; \ { \
unsigned long _qzz_leaked = 0, _qzz_dubious = 0; \ unsigned long _qzz_leaked = 0, _qzz_dubious = 0; \
unsigned long _qzz_reachable = 0, _qzz_suppressed = 0; \ unsigned long _qzz_reachable = 0, _qzz_suppressed = 0; \
VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0, \ VALGRIND_DO_CLIENT_REQUEST_STMT( \
VG_USERREQ__COUNT_LEAKS, \ VG_USERREQ__COUNT_LEAKS, \
&_qzz_leaked, &_qzz_dubious, \ &_qzz_leaked, &_qzz_dubious, \
&_qzz_reachable, &_qzz_suppressed, 0); \ &_qzz_reachable, &_qzz_suppressed, 0); \
@ -235,10 +240,10 @@ typedef
are. We also initialise '_qzz_leaked', etc because are. We also initialise '_qzz_leaked', etc because
VG_USERREQ__COUNT_LEAKS doesn't mark the values returned as VG_USERREQ__COUNT_LEAKS doesn't mark the values returned as
defined. */ \ defined. */ \
{unsigned long _qzz_res; \ { \
unsigned long _qzz_leaked = 0, _qzz_dubious = 0; \ unsigned long _qzz_leaked = 0, _qzz_dubious = 0; \
unsigned long _qzz_reachable = 0, _qzz_suppressed = 0; \ unsigned long _qzz_reachable = 0, _qzz_suppressed = 0; \
VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0, \ VALGRIND_DO_CLIENT_REQUEST_STMT( \
VG_USERREQ__COUNT_LEAK_BLOCKS, \ VG_USERREQ__COUNT_LEAK_BLOCKS, \
&_qzz_leaked, &_qzz_dubious, \ &_qzz_leaked, &_qzz_dubious, \
&_qzz_reachable, &_qzz_suppressed, 0); \ &_qzz_reachable, &_qzz_suppressed, 0); \
@ -259,9 +264,10 @@ typedef
impossible to segfault your system by using this call. impossible to segfault your system by using this call.
*/ */
#define VALGRIND_GET_VBITS(zza,zzvbits,zznbytes) \ #define VALGRIND_GET_VBITS(zza,zzvbits,zznbytes) \
VALGRIND_DO_CLIENT_REQUEST_EXPR(0, \ (unsigned)VALGRIND_DO_CLIENT_REQUEST_EXPR(0, \
VG_USERREQ__GET_VBITS, \ VG_USERREQ__GET_VBITS, \
(char*)(zza), (char*)(zzvbits), \ (const char*)(zza), \
(char*)(zzvbits), \
(zznbytes), 0, 0) (zznbytes), 0, 0)
/* Set the validity data for addresses [zza..zza+zznbytes-1], copying it /* Set the validity data for addresses [zza..zza+zznbytes-1], copying it
@ -274,10 +280,23 @@ typedef
impossible to segfault your system by using this call. impossible to segfault your system by using this call.
*/ */
#define VALGRIND_SET_VBITS(zza,zzvbits,zznbytes) \ #define VALGRIND_SET_VBITS(zza,zzvbits,zznbytes) \
VALGRIND_DO_CLIENT_REQUEST_EXPR(0, \ (unsigned)VALGRIND_DO_CLIENT_REQUEST_EXPR(0, \
VG_USERREQ__SET_VBITS, \ VG_USERREQ__SET_VBITS, \
(char*)(zza), (char*)(zzvbits), \ (const char*)(zza), \
(const char*)(zzvbits), \
(zznbytes), 0, 0 ) (zznbytes), 0, 0 )
/* Disable and re-enable reporting of addressing errors in the
specified address range. */
#define VALGRIND_DISABLE_ADDR_ERROR_REPORTING_IN_RANGE(_qzz_addr,_qzz_len) \
VALGRIND_DO_CLIENT_REQUEST_EXPR(0 /* default return */, \
VG_USERREQ__DISABLE_ADDR_ERROR_REPORTING_IN_RANGE, \
(_qzz_addr), (_qzz_len), 0, 0, 0)
#define VALGRIND_ENABLE_ADDR_ERROR_REPORTING_IN_RANGE(_qzz_addr,_qzz_len) \
VALGRIND_DO_CLIENT_REQUEST_EXPR(0 /* default return */, \
VG_USERREQ__ENABLE_ADDR_ERROR_REPORTING_IN_RANGE, \
(_qzz_addr), (_qzz_len), 0, 0, 0)
#endif #endif

4864
build/valgrind/valgrind.h
View File

File diff suppressed because it is too large Load Diff

4
egg/egg-secure-memory.c
View File

@ -655,8 +655,8 @@ memcpy_with_vbits (void *dest,
#ifdef WITH_VALGRIND #ifdef WITH_VALGRIND
if (vbits_setup == 1) { if (vbits_setup == 1) {
VALGRIND_SET_VBITS (dest, vbits, length); (void)VALGRIND_SET_VBITS (dest, vbits, length);
VALGRIND_SET_VBITS (src, vbits, length); (void)VALGRIND_SET_VBITS (src, vbits, length);
} }
free (vbits); free (vbits);
#endif #endif