generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-10-30 13:47:13 +01:00
Code Issues Projects Releases Wiki Activity

Problem: GSSAPI check for Out of memory is done conditionally

Browse Source 
Solution: Do it unconditionally.
This commit is contained in:
Thomas Braun
2017-03-27 22:53:57 +02:00
parent 19f30f7926
commit fe9f6b2837
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/gssapi_mechanism_base.cpp
View File

@@ -149,8 +149,9 @@ int zmq::gssapi_mechanism_base_t::decode_message (msg_t *msg_)
// TODO: instead of malloc/memcpy, can we just do: wrapped.value = ptr; // TODO: instead of malloc/memcpy, can we just do: wrapped.value = ptr;
const size_t alloc_length = wrapped.length? wrapped.length: 1; const size_t alloc_length = wrapped.length? wrapped.length: 1;
wrapped.value = static_cast <char *> (malloc (alloc_length)); wrapped.value = static_cast <char *> (malloc (alloc_length));
if (wrapped.length) {
alloc_assert (wrapped.value); alloc_assert (wrapped.value);
if (wrapped.length) {
memcpy(wrapped.value, ptr, wrapped.length); memcpy(wrapped.value, ptr, wrapped.length);
ptr += wrapped.length; ptr += wrapped.length;
bytes_left -= wrapped.length; bytes_left -= wrapped.length;
@@ -247,9 +248,11 @@ int zmq::gssapi_mechanism_base_t::process_initiate (msg_t *msg_, void **token_va
errno = EPROTO; errno = EPROTO;
return -1; return -1;
} }
*token_value_ = static_cast <char *> (malloc (token_length_ ? token_length_ : 1)); *token_value_ = static_cast <char *> (malloc (token_length_ ? token_length_ : 1));
if (token_length_) {
alloc_assert (*token_value_); alloc_assert (*token_value_);
if (token_length_) {
memcpy(*token_value_, ptr, token_length_); memcpy(*token_value_, ptr, token_length_);
ptr += token_length_; ptr += token_length_;
bytes_left -= token_length_; bytes_left -= token_length_;