Merge remote-tracking branch 'origin/tqtc/lts-5.15.4' into tqtc/lts-5.15-opensource

Change-Id: I3d223d54a832c8365fec4b399550da79f4c1abbb

2 files changed, 5 insertions, 7 deletions

diff --git a/src/network/socket/qlocalsocket_win.cpp b/src/network/socket/qlocalsocket_win.cpp
index 6d82656583..2599a38a36 100644
--- a/src/network/socket/qlocalsocket_win.cpp
+++ b/src/network/socket/qlocalsocket_win.cpp
@@ -255,13 +255,10 @@ void QLocalSocketPrivate::_q_pipeClosed()
     emit q->disconnected();
 
     pipeReader->stop();
+    delete pipeWriter;
+    pipeWriter = nullptr;
     destroyPipeHandles();
     handle = INVALID_HANDLE_VALUE;
-
-    if (pipeWriter) {
-        delete pipeWriter;
-        pipeWriter = 0;
-    }
 }
 
 qint64 QLocalSocket::bytesAvailable() const
diff --git a/src/network/ssl/qasn1element.cpp b/src/network/ssl/qasn1element.cpp
index d7b6aa8bd6..e8b70a14df 100644
--- a/src/network/ssl/qasn1element.cpp
+++ b/src/network/ssl/qasn1element.cpp
@@ -318,8 +318,9 @@ qint64 QAsn1Element::toInteger(bool *ok) const
         return 0;
     }
 
-    // NOTE: negative numbers are not handled
-    if (mValue.at(0) & 0x80) {
+    // NOTE: - negative numbers are not handled
+    //       - greater sizes would overflow
+    if (mValue.at(0) & 0x80 || mValue.size() > 8) {
         if (ok)
             *ok = false;
         return 0;