File apache-tomcat-CVE-2012-2733.patch of Package tomcat6

Overview Repositories Revisions Requests Users Attributes Meta

File apache-tomcat-CVE-2012-2733.patch of Package tomcat6

Index: apache-tomcat-6.0.18-src/java/org/apache/coyote/http11/InternalNioInputBuffer.java
===================================================================
--- apache-tomcat-6.0.18-src/java/org/apache/coyote/http11/InternalNioInputBuffer.java.orig	2012-11-23 13:42:23.374817672 +0100
+++ apache-tomcat-6.0.18-src/java/org/apache/coyote/http11/InternalNioInputBuffer.java	2012-11-23 13:44:46.632831595 +0100
@@ -663,10 +663,6 @@
         
         do {
             status = parseHeader();
-        } while ( status == HeaderParseStatus.HAVE_MORE_HEADERS );
-        if (status == HeaderParseStatus.DONE) {
-            parsingHeader = false;
-            end = pos;
             // Checking that
             // (1) Headers plus request line size does not exceed its limit
             // (2) There are enough bytes to avoid expanding the buffer when
@@ -675,11 +671,15 @@
             // limitation to enforce the meaning of headerBufferSize
             // From the way how buf is allocated and how blank lines are being
             // read, it should be enough to check (1) only.
-            if (end - skipBlankLinesBytes > headerBufferSize
-                    || buf.length - end < socketReadBufferSize) {
+            if (pos - skipBlankLinesBytes > headerBufferSize
+                    || buf.length - pos < socketReadBufferSize) {
                 throw new IllegalArgumentException(
                         sm.getString("iib.requestheadertoolarge.error"));
             }
+        } while ( status == HeaderParseStatus.HAVE_MORE_HEADERS );
+        if (status == HeaderParseStatus.DONE) {
+            parsingHeader = false;
+            end = pos;
             return true;
         } else {
             return false;

Places

File apache-tomcat-CVE-2012-2733.patch of Package tomcat6

Places