Author: jbellis
Date: Thu Dec 22 20:39:58 2011
New Revision: 1222436

URL: http://svn.apache.org/viewvc?rev=1222436&view=rev
Log:
throw ConfigurationException if chunk_length_kb would overflow
patch by pschuller; reviewed by jbellis for CASSANDRA-3644

Modified:
    
cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/io/compress/CompressionParameters.java

Modified: 
cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/io/compress/CompressionParameters.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/io/compress/CompressionParameters.java?rev=1222436&r1=1222435&r2=1222436&view=diff
==============================================================================
--- 
cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/io/compress/CompressionParameters.java
 (original)
+++ 
cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/io/compress/CompressionParameters.java
 Thu Dec 22 20:39:58 2011
@@ -150,7 +150,10 @@ public class CompressionParameters
 
         try
         {
-            return 1024 * Integer.parseInt(chLengthKB);
+            int parsed = Integer.parseInt(chLengthKB);
+            if (parsed > Integer.MAX_VALUE / 1024)
+                throw new ConfigurationException("Value of " + CHUNK_LENGTH_KB 
+ " is too large (" + parsed + ")");
+            return 1024 * parsed;
         }
         catch (NumberFormatException e)
         {


Reply via email to