Fixes for QByteArrayMatcher

Copy constructor and assignment operator lose data: pointer to content
and the length of content also need to be copied over.

QByteArrayMatcher::pattern() would return a null byte array if instance
was initialized with c-string.

Changed default constructor to explicitly initialize pattern length to
zero.

The bug in the assignment operator is a regression against 4.4.3.

Task-number: 251958
Reviewed-by: MariusSO
Reviewed-by: paul

1 files changed, 6 insertions, 1 deletions

diff --git a/src/corelib/tools/qbytearraymatcher.h b/src/corelib/tools/qbytearraymatcher.h
index d7f2366..633e92c 100644
--- a/src/corelib/tools/qbytearraymatcher.h
+++ b/src/corelib/tools/qbytearraymatcher.h
@@ -67,7 +67,12 @@ public:
 
     int indexIn(const QByteArray &ba, int from = 0) const;
     int indexIn(const char *str, int len, int from = 0) const;
-    inline QByteArray pattern() const { return q_pattern; }
+    inline QByteArray pattern() const
+    {
+        if (q_pattern.isNull())
+            return QByteArray((const char*)p.p, p.l);
+        return q_pattern;
+    }
 
 private:
     QByteArrayMatcherPrivate *d;