Handle case of malloc failure in mbuf_resize

PUBLISHED_FROM=0cb98ac520b8aeb8bbeb2f23b8c65c62ab256021
This commit is contained in:
Deomid Ryabkov
2015-10-30 18:38:43 +01:00
committed by Marko Mikulicic
parent 1a6bc7c514
commit e34747d1ad
+7 -5
View File
@@ -144,13 +144,15 @@ void mbuf_free(struct mbuf *mbuf) {
void mbuf_resize(struct mbuf *a, size_t new_size) {
if (new_size > a->size || (new_size < a->size && new_size >= a->len)) {
a->buf = (char *) MBUF_REALLOC(a->buf, new_size);
char *buf = (char *) MBUF_REALLOC(a->buf, new_size);
/*
* In case realloc fails, there's not much we can do except set size to 0.
* Note that NULL is a valid return value from realloc when size == 0, but
* that is covered too.
* In case realloc fails, there's not much we can do, except keep things as
* they are. Note that NULL is a valid return value from realloc when
* size == 0, but that is covered too.
*/
a->size = (a->buf != NULL ? new_size : 0);
if (buf == NULL && new_size != 0) return;
a->buf = buf;
a->size = new_size;
}
}