Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix using mbuf after returning it to mbuf free list for redis mset. #461

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix using mbuf after returning it to mbuf free list for redis mset. #461

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ca98804
Fix memroy leak for redis mset.
oneniceapp Mar 22, 2016
00c2f86
Fix travis.
oneniceapp Mar 22, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
language: c
script: bash ./travis.sh

sudo: required
Copy link
Contributor

@andyqzb andyqzb Aug 26, 2016 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is the intention of this line?

8 changes: 6 additions & 2 deletions src/proto/nc_redis.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2293,6 +2293,7 @@ redis_copy_bulk(struct msg *dst, struct msg *src)
struct mbuf *mbuf, *nbuf;
uint8_t *p;
uint32_t len = 0;
uint32_t mlen = 0;
uint32_t bytes = 0;
rstatus_t status;

Expand Down Expand Up @@ -2328,13 +2329,16 @@ redis_copy_bulk(struct msg *dst, struct msg *src)

/* copy len bytes to dst */
for (; mbuf;) {
if (mbuf_length(mbuf) <= len) { /* steal this buf from src to dst */
mlen = mbuf_length(mbuf);
if (mlen <= len) { /* steal this buf from src to dst */
nbuf = STAILQ_NEXT(mbuf, next);
mbuf_remove(&src->mhdr, mbuf);
if (dst != NULL) {
mbuf_insert(&dst->mhdr, mbuf);
} else {
mbuf_put(mbuf);
}
len -= mbuf_length(mbuf);
len -= mlen;
mbuf = nbuf;
} else { /* split it */
if (dst != NULL) {
Expand Down