Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
VPP-650: handle buffer failure in vlib_buffer_copy(...)
[vpp.git]
/
src
/
vlib
/
buffer_funcs.h
diff --git
a/src/vlib/buffer_funcs.h
b/src/vlib/buffer_funcs.h
index
fd051de
..
0b583a6
100644
(file)
--- a/
src/vlib/buffer_funcs.h
+++ b/
src/vlib/buffer_funcs.h
@@
-489,7
+489,15
@@
vlib_buffer_copy (vlib_main_t * vm, vlib_buffer_t * b)
vec_validate (new_buffers, n_buffers - 1);
n_alloc = vlib_buffer_alloc (vm, new_buffers, n_buffers);
vec_validate (new_buffers, n_buffers - 1);
n_alloc = vlib_buffer_alloc (vm, new_buffers, n_buffers);
- ASSERT (n_alloc == n_buffers);
+
+ /* No guarantee that we'll get all the buffers we asked for */
+ if (PREDICT_FALSE (n_alloc < n_buffers))
+ {
+ if (n_alloc > 0)
+ vlib_buffer_free (vm, new_buffers, n_alloc);
+ vec_free (new_buffers);
+ return 0;
+ }
/* 1st segment */
s = b;
/* 1st segment */
s = b;
@@
-518,6
+526,7
@@
vlib_buffer_copy (vlib_main_t * vm, vlib_buffer_t * b)
d->flags = s->flags & flag_mask;
}
d->flags = s->flags & flag_mask;
}
+ vec_free (new_buffers);
return fd;
}
return fd;
}