From 2e2806d7441cc24aaa24ef59c6f75d0d87762876 Mon Sep 17 00:00:00 2001 From: Gregory Lemercier Date: Sun, 7 Oct 2018 18:20:29 +0200 Subject: [PATCH 1/2] Adds relicensing grant --- RELICENSE/glemercier.md | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 RELICENSE/glemercier.md diff --git a/RELICENSE/glemercier.md b/RELICENSE/glemercier.md new file mode 100644 index 00000000..97428c77 --- /dev/null +++ b/RELICENSE/glemercier.md @@ -0,0 +1,17 @@ +# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL + +This is a statement by Anton Dimitrov that grants permission to +relicense its copyrights in the libzmq C++ library (ZeroMQ) under the +Mozilla Public License v2 (MPLv2) or any other Open Source Initiative +approved license chosen by the current ZeroMQ BDFL (Benevolent +Dictator for Life). + +A portion of the commits made by the Github handle "glemercier", with +commit author "Gregory Lemercier ", are +copyright of Gregory Lmercier. This document hereby grants the libzmq +project team to relicense libzmq, including all past, present and +future contributions of the author listed above. + +Gregory Lemercier + +2018/10/07 From ffe62d3398d5e0191f554f61049aa7ec9fc892ae Mon Sep 17 00:00:00 2001 From: Gregory Lemercier Date: Sun, 7 Oct 2018 18:06:54 +0200 Subject: [PATCH 2/2] Fix build on arm64 architectures with some strict compilers This patch fixes an issue that occurs on 64-bit architetures under strict compiler rules. The code initially checked that the received size stored in 'uint64_t' was not bigger than the max value of a 'size_t' variable, which is legitimate on 32-bit architectures where 'size_t' variables are stored on 32 bits. On 64-bit architectures, this test no longer makes sense since 'uint64_t' and 'size_t' types have the same size. The issue is fixed by ignoring this portion of code when built for arm64. --- src/v1_decoder.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/v1_decoder.cpp b/src/v1_decoder.cpp index b002dc9d..2c8c97a7 100644 --- a/src/v1_decoder.cpp +++ b/src/v1_decoder.cpp @@ -111,11 +111,13 @@ int zmq::v1_decoder_t::eight_byte_size_ready (unsigned char const *) return -1; } +#ifndef __aarch64__ // Message size must fit within range of size_t data type. if (payload_length - 1 > std::numeric_limits::max ()) { errno = EMSGSIZE; return -1; } +#endif const size_t msg_size = static_cast (payload_length - 1);