Fix bug in vconn-tcp, vconn-ssl that prevented minimum-length OpenFlow packets from...

diff --git a/lib/vconn-ssl.c b/lib/vconn-ssl.c
index 30d8caf63194b850845eb07fe11cc86d663a8f8b..2bdcfb1b5ffe28ec207045f5b7fab27162ce5dde 100644 (file)
--- a/lib/vconn-ssl.c
+++ b/lib/vconn-ssl.c
@@ -361,6 +361,11 @@ again:
             return EPROTO;
         }
         want_bytes = length - rx->size;
+        if (!want_bytes) {
+            *bufferp = rx;
+            sslv->rxbuf = NULL;
+            return 0;
+        }
     }
     buffer_reserve_tailroom(rx, want_bytes);
 

diff --git a/lib/vconn-tcp.c b/lib/vconn-tcp.c
index 1fe5919f68730e8a5646fee5383203a3500295ea..5f468ae40efd47086415e47736f77b039ddcce3b 100644 (file)
--- a/lib/vconn-tcp.c
+++ b/lib/vconn-tcp.c
@@ -191,6 +191,11 @@ again:
             return EPROTO;
         }
         want_bytes = length - rx->size;
+        if (!want_bytes) {
+            *bufferp = rx;
+            tcp->rxbuf = NULL;
+            return 0;
+        }
     }
     buffer_reserve_tailroom(rx, want_bytes);