Merge pull request http-parser#1 from a2800276/catchup

spariev · spariev · commit 6a428af55156 · 2012-03-10T08:53:09.000-08:00
Catchup, overflow...
diff --git a/src/impl/http_parser/lolevel/HTTPParser.java b/src/impl/http_parser/lolevel/HTTPParser.java
@@ -20,7 +20,7 @@ public class  HTTPParser {
 	int flags; // TODO
 
 	int nread;
-	int content_length;
+	long content_length;
 
   int p_start; // updated each call to execute to indicate where the buffer was before we began calling it.
 
@@ -1125,13 +1125,13 @@ public int execute(ParserSettings settings, ByteBuffer data) {
 return error(settings, "Content-Length not numeric", data);
               } 
 
-              int t = content_length; 
+              long t = content_length; 
               t *= 10;
-              t += (int)ch - 0x30;
+              t += (long)ch - 0x30;
 
               /* Overflow? */
-              //TODO Not sure how to check
-              if (t < content_length || t == -1) { //ULLONG_MAX ??
+              // t will wrap and become negative ...
+              if (t < content_length) { 
                 return error(settings, "Invalid content length", data);
               }
               content_length = t;
@@ -1379,11 +1379,11 @@ public int execute(ParserSettings settings, ByteBuffer data) {
             }
             return error(settings, "invalid hex char in chunk content length", data);
           }
-          int t = content_length;
+          long t = content_length;
           
           t *= 16;
           t += c;
-          if(t < content_length || t == -1){
+          if(t < content_length){
             return error(settings, "invalid content length", data);
           }
           content_length = t;
@@ -1639,6 +1639,9 @@ final int min (int a, int b) {
     return a < b ? a : b;
   }
   
+  final int min (int a, long b) {
+    return a < b ? a : (int)b;
+  }
   /* probably not the best place to hide this ... */
 	public boolean HTTP_PARSER_STRICT;
   State new_message() {
