Fixed possible endless loop with some buffer sizes (thanks to John van der Kamp).

2 files changed, 54 insertions, 7 deletions

diff --git a/src/vmime/utility/parserInputStreamAdapter.cpp b/src/vmime/utility/parserInputStreamAdapter.cpp
index 5ab26ef0..f1eb0e70 100644
--- a/src/vmime/utility/parserInputStreamAdapter.cpp
+++ b/src/vmime/utility/parserInputStreamAdapter.cpp
@@ -148,14 +148,10 @@ size_t parserInputStreamAdapter::findNext
 				const size_t bytesRead = read(findBuffer2, BUFFER_SIZE / 2);
 
 				if (bytesRead == 0)
-				{
 					isEOF = true;
-				}
-				else
-				{
-					findBufferLen = (BUFFER_SIZE / 2) + bytesRead;
-					findBufferOffset += (BUFFER_SIZE / 2);
-				}
+
+				findBufferLen = (BUFFER_SIZE / 2) + bytesRead;
+				findBufferOffset += (BUFFER_SIZE / 2);
 			}
 		}
 
diff --git a/tests/utility/parserInputStreamAdapterTest.cpp b/tests/utility/parserInputStreamAdapterTest.cpp
new file mode 100644
index 00000000..0fd4f4e8
--- /dev/null
+++ b/tests/utility/parserInputStreamAdapterTest.cpp
@@ -0,0 +1,51 @@
+//
+// VMime library (http://www.vmime.org)
+// Copyright (C) 2002-2013 Vincent Richard <[email protected]>
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License as
+// published by the Free Software Foundation; either version 3 of
+// the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with this program; if not, write to the Free Software Foundation, Inc.,
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// Linking this library statically or dynamically with other modules is making
+// a combined work based on this library.  Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+
+#include "tests/testUtils.hpp"
+
+#include "vmime/utility/parserInputStreamAdapter.hpp"
+
+
+VMIME_TEST_SUITE_BEGIN(parserInputStreamAdapterTest)
+
+	VMIME_TEST_LIST_BEGIN
+		VMIME_TEST(testEndlessLoopBufferSize)
+	VMIME_TEST_LIST_END
+
+
+	void testEndlessLoopBufferSize()
+	{
+		static const unsigned int BUFFER_SIZE = 4096;  // same as in parserInputStreamAdapter::findNext()
+
+		vmime::string str(BUFFER_SIZE, 'X');
+
+		vmime::shared_ptr <vmime::utility::inputStreamStringAdapter> iss =
+			vmime::make_shared <vmime::utility::inputStreamStringAdapter>(str);
+
+		vmime::shared_ptr <vmime::utility::parserInputStreamAdapter> parser =
+			vmime::make_shared <vmime::utility::parserInputStreamAdapter>(iss);
+
+		VASSERT_EQ("Not found", vmime::string::npos, parser->findNext("token"));
+	}
+
+VMIME_TEST_SUITE_END