diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/nfc/doc/src/nfc-index.qdoc | 2 | ||||
| -rw-r--r-- | src/tools/sdpscanner/main.cpp | 7 |
2 files changed, 5 insertions, 4 deletions
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: |