Fix bug in websocket on empty packets
authorJosé Bollo <jose.bollo@iot.bzh>
Thu, 1 Jun 2017 20:14:34 +0000 (22:14 +0200)
committerJosé Bollo <jose.bollo@iot.bzh>
Thu, 1 Jun 2017 20:14:34 +0000 (22:14 +0200)
Change-Id: I21d6e36df183b798539cf2a378976cc595a77029
Signed-off-by: José Bollo <jose.bollo@iot.bzh>
src/afb-ws.c

index b157a49..6d48887 100644 (file)
@@ -395,12 +395,12 @@ static int aws_read(struct afb_ws *ws, size_t size)
        ssize_t sz;
        char *buffer;
 
-       if (size != 0) {
+       if (size != 0 || ws->buffer.buffer == NULL) {
                buffer = realloc(ws->buffer.buffer, ws->buffer.size + size + 1);
                if (buffer == NULL)
                        return 0;
                ws->buffer.buffer = buffer;
-               do {
+               while (size != 0) {
                        sz = websock_read(ws->ws, &buffer[ws->buffer.size], size);
                        if (sz < 0) {
                                if (errno != EAGAIN)
@@ -412,7 +412,7 @@ static int aws_read(struct afb_ws *ws, size_t size)
                                ws->buffer.size += (size_t)sz;
                                size -= (size_t)sz;
                        }
-               } while (size != 0);
+               }
        }
        return 1;
 }