diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2024-01-04 21:21:46 +0200 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2024-01-04 21:21:46 +0200 |
| commit | f1fed9fb2a7e5b877d8408f92040651b0cf47dbb (patch) | |
| tree | 6490b6bea7ffe8385932cc5f90ed6012f6c85dc4 | |
| parent | 45604bedf6d3b022fc9758eeb4cefab0f9f2dea5 (diff) | |
| parent | c2fa8ee0ca5e1c8e1fe16fc735fd4614435c80a5 (diff) | |
Merge remote-tracking branch 'origin/tqtc/lts-5.15.13' into tqtc/lts-5.15-opensourcev5.15.13-lts-lgpl5.15
Change-Id: I7e2913b3ecdd2da61975863e5b0df9c69485d39c
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | src/nfc/doc/src/nfc-index.qdoc | 2 | ||||
| -rw-r--r-- | src/tools/sdpscanner/main.cpp | 7 |
3 files changed, 6 insertions, 5 deletions
diff --git a/.qmake.conf b/.qmake.conf index 0b51738b..33171164 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -2,4 +2,4 @@ load(qt_build_config) DEFINES += QT_NO_FOREACH QT_NO_JAVA_STYLE_ITERATORS QT_NO_LINKED_LIST -MODULE_VERSION = 5.15.12 +MODULE_VERSION = 5.15.13 diff --git a/src/nfc/doc/src/nfc-index.qdoc b/src/nfc/doc/src/nfc-index.qdoc index 21f775a6..26e4f637 100644 --- a/src/nfc/doc/src/nfc-index.qdoc +++ b/src/nfc/doc/src/nfc-index.qdoc @@ -35,7 +35,7 @@ The NFC API provides connectivity between NFC enabled devices. Currently the API is supported on \l{Qt for Android}{Android}, -and \l{Qt for Linux/X11}{Linux} using \l {https://01.org/linux-nfc}{Neard} v0.14 or later. +and \l{Qt for Linux/X11}{Linux} using \l {https://github.com/linux-nfc/neard}{Neard} v0.14 or later. \section1 Overview diff --git a/src/tools/sdpscanner/main.cpp b/src/tools/sdpscanner/main.cpp index 7e09ca6e..690f9aaa 100644 --- a/src/tools/sdpscanner/main.cpp +++ b/src/tools/sdpscanner/main.cpp @@ -159,7 +159,9 @@ static void parseAttributeValues(sdp_data_t *data, int indentation, QByteArray & break; } else if (!isprint(text[i])) { hasNonPrintableChar = true; - text.resize(text.indexOf('\0')); // cut trailing content + const auto firstNullIdx = text.indexOf('\0'); + if (firstNullIdx > 0) + text.resize(firstNullIdx); // cut trailing content break; } } @@ -211,9 +213,8 @@ static void parseAttributeValues(sdp_data_t *data, int indentation, QByteArray & case SDP_URL_STR8: case SDP_URL_STR16: case SDP_URL_STR32: - strncpy(snBuffer, data->val.str, data->unitSize - 1); xmlOutput.append("<url value=\""); - xmlOutput.append(snBuffer); + xmlOutput.append(data->val.str, qstrnlen(data->val.str, data->unitSize)); xmlOutput.append("\"/>\n"); break; default: |