3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-03-12 17:12:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3902 from bluca/fuzzers

Browse Source 
Problems: ZMTP v1 static allocator is needlessly resized, ZMQ_DISABLE_TEST_TIMEOUT does not work anymore
This commit is contained in:
Doron Somech 2020-05-08 21:25:37 +03:00 committed by GitHub
commit 28cb820f4f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/decoder_allocators.hpp
View File

@ -58,7 +58,8 @@ class c_single_allocator
std::size_t size () const { return _buf_size; } std::size_t size () const { return _buf_size; }
void resize (std::size_t new_size_) { _buf_size = new_size_; } // This buffer is fixed, size must not be changed
void resize (std::size_t new_size_) { LIBZMQ_UNUSED (new_size_); }
private: private:
std::size_t _buf_size; std::size_t _buf_size;

2
tests/testutil.cpp
View File

@ -233,10 +233,12 @@ void setup_test_environment (int timeout_seconds_)
// abort test after 121 seconds // abort test after 121 seconds
alarm (121); alarm (121);
#else #else
#if !defined ZMQ_DISABLE_TEST_TIMEOUT
// abort test after timeout_seconds_ seconds // abort test after timeout_seconds_ seconds
alarm (timeout_seconds_); alarm (timeout_seconds_);
#endif #endif
#endif #endif
#endif
#if defined __MVS__ #if defined __MVS__
// z/OS UNIX System Services: Ignore SIGPIPE during test runs, as a // z/OS UNIX System Services: Ignore SIGPIPE during test runs, as a
// workaround for no SO_NOGSIGPIPE socket option. // workaround for no SO_NOGSIGPIPE socket option.