projects
/
project
/
libubox.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6f192a6
)
ustream: return NULL in ustream_get_read_buf if there's a buffer, but no data
author
Felix Fietkau
<nbd@openwrt.org>
Fri, 21 Jun 2013 17:53:09 +0000
(19:53 +0200)
committer
Felix Fietkau
<nbd@openwrt.org>
Fri, 21 Jun 2013 17:53:09 +0000
(19:53 +0200)
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
ustream.c
patch
|
blob
|
history
diff --git
a/ustream.c
b/ustream.c
index 88f13326a471d58b17b67495fc833da30066fd7d..fd4339527d305dfcd9851fe0fb4562e7b6082141 100644
(file)
--- a/
ustream.c
+++ b/
ustream.c
@@
-311,15
+311,13
@@
void ustream_fill_read(struct ustream *s, int len)
char *ustream_get_read_buf(struct ustream *s, int *buflen)
{
- char *data;
- int len;
+ char *data
= NULL
;
+ int len
= 0
;
if (s->r.head) {
len = s->r.head->tail - s->r.head->data;
- data = s->r.head->data;
- } else {
- len = 0;
- data = NULL;
+ if (len > 0)
+ data = s->r.head->data;
}
if (buflen)