ustream: avoid calling s->poll from a write path to avoid looping back through the...

[project/libubox.git] / ustream.c

diff --git a/ustream.c b/ustream.c
index 8e6efcd..9c61806 100644 (file)
--- a/ustream.c
+++ b/ustream.c
@@ -341,7 +341,7 @@ bool ustream_write_pending(struct ustream *s)
        if (s->write_error)
                return false;
 
        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;
 
                struct ustream_buf *next = buf->next;
                int maxlen = buf->tail - buf->data;
 


@@ -435,6 +435,9 @@ int ustream_vprintf(struct ustream *s, const char *format, va_list arg)
        va_list arg2;
        int wr, maxlen, buflen;
 
        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);
        if (!l->data_bytes) {
                buf = alloca(MAX_STACK_BUFLEN);
                va_copy(arg2, arg);


@@ -493,6 +496,9 @@ int ustream_printf(struct ustream *s, const char *format, ...)
        va_list arg;
        int ret;
 
        va_list arg;
        int ret;
 

+       if (s->write_error)
+               return 0;
+

        va_start(arg, format);
        ret = ustream_vprintf(s, format, arg);
        va_end(arg);
        va_start(arg, format);
        ret = ustream_vprintf(s, format, arg);
        va_end(arg);