Skip to content
Merged
Changes from all commits
Commits
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
24 changes: 15 additions & 9 deletions common/iovector.h
Original file line number Diff line number Diff line change
Expand Up @@ -535,12 +535,15 @@ class iovector
update(va);
return ptr;
}

if (va.sum() < bytes) {
return nullptr;
}

auto buf = do_malloc(bytes);
auto ret = extract_front(bytes, buf);
return ret == bytes ?
buf :
nullptr;
if (buf) {
extract_front(bytes, buf);
}
return buf;
}

// try to extract `bytes` bytes from the back
Expand Down Expand Up @@ -626,12 +629,15 @@ class iovector
update(va);
return ptr;
}
if (va.sum() < bytes) {
return nullptr;
}

auto buf = do_malloc(bytes);
auto ret = extract_back(bytes, buf);
return ret == bytes ?
buf :
nullptr;
if (buf) {
extract_back(bytes, buf);
}
return buf;
}

// copy data to a buffer of `size` bytes,
Expand Down
Loading