blobmsg_json: do not corrupt UTF-8 strings

[project/libubox.git] / ustream.c

diff --git a/ustream.c b/ustream.c
index 8e6efcd..88f1332 100644 (file)
--- a/ustream.c
+++ b/ustream.c
@@ -37,6 +37,7 @@ static void ustream_init_buf(struct ustream_buf *buf, int len)
 
 static void ustream_add_buf(struct ustream_buf_list *l, struct ustream_buf *buf)
 {
+       l->buffers++;
        if (!l->tail)
                l->head = buf;
        else
@@ -329,8 +330,9 @@ char *ustream_get_read_buf(struct ustream *s, int *buflen)
 
 static void ustream_write_error(struct ustream *s)
 {
+       if (!s->write_error)
+               ustream_state_change(s);
        s->write_error = true;
-       ustream_state_change(s);
 }
 
 bool ustream_write_pending(struct ustream *s)
@@ -341,7 +343,7 @@ bool ustream_write_pending(struct ustream *s)
        if (s->write_error)
                return false;
 
-       while (buf) {
+       while (buf && s->w.data_bytes) {
                struct ustream_buf *next = buf->next;
                int maxlen = buf->tail - buf->data;
 
@@ -435,6 +437,9 @@ int ustream_vprintf(struct ustream *s, const char *format, va_list arg)
        va_list arg2;
        int wr, maxlen, buflen;
 
+       if (s->write_error)
+               return 0;
+
        if (!l->data_bytes) {
                buf = alloca(MAX_STACK_BUFLEN);
                va_copy(arg2, arg);
@@ -493,6 +498,9 @@ int ustream_printf(struct ustream *s, const char *format, ...)
        va_list arg;
        int ret;
 
+       if (s->write_error)
+               return 0;
+
        va_start(arg, format);
        ret = ustream_vprintf(s, format, arg);
        va_end(arg);