diff options
| author | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2015-02-04 10:32:02 -0500 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2015-02-06 08:11:49 +0000 |
| commit | 0b0f7fa0911814cb824922b1740a94381ce4d265 (patch) | |
| tree | f5ca73777789cc78f3ec3b292fa9bf97807ebf5b /tools | |
| parent | 881ff5df92a1c12a3afaeea3f422cb36f6e84b59 (diff) | |
More emem removal.
Remove emem's 8-byte-memory-alignment configure check as well as references
to all the environment variables emem used.
Change-Id: I897aec9e9c68e064454561e7a9f066b18892ec66
Reviewed-on: https://code.wireshark.org/review/6950
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/test-common.sh | 7 | ||||
| -rwxr-xr-x | tools/valgrind-wireshark.sh | 2 |
2 files changed, 0 insertions, 9 deletions
diff --git a/tools/test-common.sh b/tools/test-common.sh index 8d81b3ca5b..0388f9b097 100644 --- a/tools/test-common.sh +++ b/tools/test-common.sh @@ -90,13 +90,6 @@ fi ############################################################################## ### Set up environment variables for fuzz testing ### ############################################################################## -# Initialize ep_ allocated memory to 0xBADDCAFE and freed memory -# to 0xDEADBEEF -export WIRESHARK_DEBUG_SCRUB_MEMORY= -# Verify that ep_ allocated memory is not passed to certain routines -# which need the memory to be persistent. -export WIRESHARK_EP_VERIFY_POINTERS= -export WIRESHARK_SE_VERIFY_POINTERS= # Use the Wmem strict allocator which does canaries and scrubbing etc. export WIRESHARK_DEBUG_WMEM_OVERRIDE=strict # Abort if a dissector adds too many items to the tree diff --git a/tools/valgrind-wireshark.sh b/tools/valgrind-wireshark.sh index 7d46163084..b81b74ba35 100755 --- a/tools/valgrind-wireshark.sh +++ b/tools/valgrind-wireshark.sh @@ -91,8 +91,6 @@ if [ "$BIN_DIR" = "." ]; then fi if [ "$TOOL" != "callgrind" ]; then - export WIRESHARK_DEBUG_EP_NO_CHUNKS= - export WIRESHARK_DEBUG_SE_NO_CHUNKS= export WIRESHARK_DEBUG_WMEM_OVERRIDE=simple export G_SLICE=always-malloc # or debug-blocks fi |