From 1b2786d8020acecc94a82e7cd39dde5c28813f13 Mon Sep 17 00:00:00 2001
From: Jeremy Lainé <jeremy.laine@m4x.org>
Date: Mon, 9 Aug 2010 07:49:39 +0000
Subject: tighten regex for stream start/end (issue #58)

---
 source/QXmppStream.cpp | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

(limited to 'source')

diff --git a/source/QXmppStream.cpp b/source/QXmppStream.cpp
index 319d4f5e..f2f712ca 100644
--- a/source/QXmppStream.cpp
+++ b/source/QXmppStream.cpp
@@ -762,23 +762,17 @@ bool QXmppStream::sendToServer(const QByteArray& packet)
 bool QXmppStream::hasStartStreamElement(const QByteArray& data)
 {
     QString str(data);
-    QRegExp regex("(<\\?xml.*\\?>)?\\s*<stream:stream.*>");
+    QRegExp regex("^(<\\?xml.*\\?>)?\\s*<stream:stream.*>");
     regex.setMinimal(true);
-    if(str.contains(regex))
-        return true;
-    else
-        return false;
+    return str.contains(regex);
 }
 
 bool QXmppStream::hasEndStreamElement(const QByteArray& data)
 {
     QString str(data);
-    QRegExp regex("</stream:stream>");
+    QRegExp regex("</stream:stream>$");
     regex.setMinimal(true);
-    if(str.contains(regex))
-        return true;
-    else
-        return false;
+    return str.contains(regex);
 }
 
 void QXmppStream::sendStartTls()
-- 
cgit v1.2.3