fixed critical bug (double boundary at the end runs daemon in infinit…

…e loop)
lmovsesjan · Mar 14, 2013 · 2bda23a · 2bda23a
1 parent 3b433ee
commit 2bda23a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,10 @@
+fastcgi-daemon2 (2.10-18) unstable; urgency=low
+
+  * fixed critical bug (double boundary at the end runs daemon in
+    infinite loop)
+
+ -- Leonid A. Movsesjan <lmovsesjan@yandex-team.ru>  Thu, 14 Mar 2013 20:00:52 +0400
+
 fastcgi-daemon2 (2.10-17) unstable; urgency=low
 
   * Added configurable time format to file logger

diff --git a/library/parser.cpp b/library/parser.cpp
@@ -228,7 +228,9 @@ Parser::parseMultipart(RequestImpl *req, DataBuffer data, const std::string &bou
 				throw std::runtime_error("malformed multipart message");
 			}
 			if (head.size() == 2 && head.startsWith(MINUS_PREFIX_STRING)) {
-				continue;
+				if (tail.size() != 3 || !tail.startsWith(MINUS_PREFIX_STRING)) {
+					continue;
+				}
 			}
 			else if (head.startsWith(RETURN_RN_STRING)) {
 				head = head.trimn(2, 0);