Fix packet parser

couchbaselabs · Mar 23, 2012 · 6869e7d · 6869e7d
1 parent d31f3a2
commit 6869e7d
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/lib/em-couchbase/packet.rb b/lib/em-couchbase/packet.rb
@@ -152,7 +152,11 @@ def self.parse(data)
               opaque,
               cas ) = header.unpack(RESPONSE_HEADER_FMT)
 
-            if data.length < bodylen
+            if magic != 0x81
+              fail Couchbase::Error::Protocol.new "Broken packet: #{header.inspect}"
+            end
+
+            if data.size < bodylen + RESPONSE_HEADER_SIZE
               return  # need moar data
             else
               data[0...RESPONSE_HEADER_SIZE] = ""