2 files changed, 16 insertions, 14 deletions
diff --git a/qpid/cpp/src/qpid/framing/AMQFrame.cpp b/qpid/cpp/src/qpid/framing/AMQFrame.cpp
index d861251dba..c1fc647b52 100644
--- a/qpid/cpp/src/qpid/framing/AMQFrame.cpp
+++ b/qpid/cpp/src/qpid/framing/AMQFrame.cpp
@@ -78,7 +78,7 @@ bool AMQFrame::decode(Buffer& buffer)
     uint8_t  type = buffer.getOctet();
     uint16_t frame_size =  buffer.getShort();
     if (frame_size < frameOverhead())
-        throw FramingErrorException(QPID_MSG("Frame size too small"));    
+        throw FramingErrorException(QPID_MSG("Frame size too small " << frame_size));    
     uint8_t  reserved1 = buffer.getOctet();
     uint8_t  field1 = buffer.getOctet();
     subchannel = field1 & 0x0f;
diff --git a/qpid/cpp/src/qpid/framing/FieldTable.cpp b/qpid/cpp/src/qpid/framing/FieldTable.cpp
index 1f8ffa72bc..bd20c10c37 100644
--- a/qpid/cpp/src/qpid/framing/FieldTable.cpp
+++ b/qpid/cpp/src/qpid/framing/FieldTable.cpp
@@ -132,19 +132,21 @@ void FieldTable::encode(Buffer& buffer) const{
 
 void FieldTable::decode(Buffer& buffer){
     uint32_t len = buffer.getLong();
-    uint32_t available = buffer.available();
-    uint32_t count = buffer.getLong();
-    if (available < len)
-        throw IllegalArgumentException(QPID_MSG("Not enough data for  field table."));
-    uint32_t leftover = available - len;
-    while(buffer.available() > leftover && count--){
-        std::string name;
-        ValuePtr value(new FieldValue);
-
-        buffer.getShortString(name);
-        value->decode(buffer);
-        values[name] = ValuePtr(value);
-    }    
+    if (len) {
+        uint32_t available = buffer.available();
+        if (available < len)
+            throw IllegalArgumentException(QPID_MSG("Not enough data for  field table."));
+        uint32_t count = buffer.getLong();
+        uint32_t leftover = available - len;
+        while(buffer.available() > leftover && count--){
+            std::string name;
+            ValuePtr value(new FieldValue);
+            
+            buffer.getShortString(name);
+            value->decode(buffer);
+            values[name] = ValuePtr(value);
+        }    
+    }
 }