You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by br...@apache.org on 2011/08/11 20:54:12 UTC

svn commit: r1156731 - in /thrift/trunk/lib/java/src/org/apache/thrift/transport: TFastFramedTransport.java TFramedTransport.java

Author: bryanduxbury
Date: Thu Aug 11 18:54:11 2011
New Revision: 1156731

URL: http://svn.apache.org/viewvc?rev=1156731&view=rev
Log:
THRIFT-1205. java: port server unduly fragile with arbitrary input

Increase the default max frame size to 16MB.

Patch: Ryan King

Modified:
    thrift/trunk/lib/java/src/org/apache/thrift/transport/TFastFramedTransport.java
    thrift/trunk/lib/java/src/org/apache/thrift/transport/TFramedTransport.java

Modified: thrift/trunk/lib/java/src/org/apache/thrift/transport/TFastFramedTransport.java
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/java/src/org/apache/thrift/transport/TFastFramedTransport.java?rev=1156731&r1=1156730&r2=1156731&view=diff
==============================================================================
--- thrift/trunk/lib/java/src/org/apache/thrift/transport/TFastFramedTransport.java (original)
+++ thrift/trunk/lib/java/src/org/apache/thrift/transport/TFastFramedTransport.java Thu Aug 11 18:54:11 2011
@@ -59,9 +59,9 @@ public class TFastFramedTransport extend
    */
   public static final int DEFAULT_BUF_CAPACITY = 1024;
   /**
-   * How big is the largest allowable frame? Defaults to Integer.MAX_VALUE.
+   * How big is the largest allowable frame? Defaults to 16MB.
    */
-  public static final int DEFAULT_MAX_LENGTH = Integer.MAX_VALUE;
+  public static final int DEFAULT_MAX_LENGTH = 16384000;
 
   private final TTransport underlying;
   private final AutoExpandingBufferWriteTransport writeBuffer;

Modified: thrift/trunk/lib/java/src/org/apache/thrift/transport/TFramedTransport.java
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/java/src/org/apache/thrift/transport/TFramedTransport.java?rev=1156731&r1=1156730&r2=1156731&view=diff
==============================================================================
--- thrift/trunk/lib/java/src/org/apache/thrift/transport/TFramedTransport.java (original)
+++ thrift/trunk/lib/java/src/org/apache/thrift/transport/TFramedTransport.java Thu Aug 11 18:54:11 2011
@@ -27,7 +27,7 @@ import org.apache.thrift.TByteArrayOutpu
  */
 public class TFramedTransport extends TTransport {
 
-  protected static final int DEFAULT_MAX_LENGTH = 0x7FFFFFFF;
+  protected static final int DEFAULT_MAX_LENGTH = 16384000;
 
   private int maxLength_;