diff options
| author | Pasi Petäjäjärvi <pasi.petajajarvi@qt.io> | 2022-02-22 17:11:52 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-02-24 15:22:02 +0000 |
| commit | 184e91fde7188194a9305a4da242888be691a88d (patch) | |
| tree | 8af0555403a315b4fed86766417d318ecb004627 | |
| parent | 6c85067ba51fae169b99538b2ba3a5dd30348227 (diff) | |
| download | qtbase-184e91fde7188194a9305a4da242888be691a88d.tar.gz | |
Fix getsockopt option_value initial initialization
On some platforms, some of the options we're getting the value
for may be a single byte, so attempting to read the full int
produces garbage.
Found with IP_MULTICAST_TTL and IP_MULTICAST_LOOP on QNX. See:
https://www.qnx.com/developers/docs/7.1/index.html#com.qnx.doc.neutrino.lib_ref/topic/g/getsockopt.html#getsockopt__IP_MULTICAST_TTL
Change-Id: Id9f7f249c6c4be0c3f94c5904d402b4ec4e17b59
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit df270368eef9ccc357f9fea3c51a8152bdecb2d6)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/network/socket/qnativesocketengine_unix.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/network/socket/qnativesocketengine_unix.cpp b/src/network/socket/qnativesocketengine_unix.cpp index 92e57501b3..d63ec91ead 100644 --- a/src/network/socket/qnativesocketengine_unix.cpp +++ b/src/network/socket/qnativesocketengine_unix.cpp @@ -46,6 +46,7 @@ #include "qelapsedtimer.h" #include "qvarlengtharray.h" #include "qnetworkinterface.h" +#include "qendian.h" #include <time.h> #include <errno.h> #include <fcntl.h> @@ -364,12 +365,12 @@ int QNativeSocketEnginePrivate::option(QNativeSocketEngine::SocketOption opt) co } int n, level; - int v = -1; + int v = 0; QT_SOCKOPTLEN_T len = sizeof(v); convertToLevelAndOption(opt, socketProtocol, level, n); if (n != -1 && ::getsockopt(socketDescriptor, level, n, (char *) &v, &len) != -1) - return v; + return len == 1 ? qFromUnaligned<quint8>(&v) : v; return -1; } |