diff options
author | ewolfok <ewolfok@126.com> | 2014-07-08 17:43:58 +0400 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2014-07-26 05:50:50 +0400 |
commit | 22bbcfddd7b2061343b773c3180f318e71b8d6d7 (patch) | |
tree | e9d61f2ea22ec6a44717ee64b695277f9c88d73e /blob.c | |
parent | f3977836afc82ce32c203173bd393789e05a123e (diff) |
blob: improve out-of-memory handling
Signed-off-by: Chen Bin <ewolfok@126.com>
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Diffstat (limited to 'blob.c')
-rw-r--r-- | blob.c | 25 |
1 files changed, 17 insertions, 8 deletions
@@ -21,12 +21,15 @@ static bool blob_buffer_grow(struct blob_buf *buf, int minlen) { + struct blob_buf *new; int delta = ((minlen / 256) + 1) * 256; - buf->buflen += delta; - buf->buf = realloc(buf->buf, buf->buflen); - if (buf->buf) - memset(buf->buf + buf->buflen - delta, 0, delta); - return !!buf->buf; + new = realloc(buf->buf, buf->buflen + delta); + if (new) { + buf->buf = new; + memset(buf->buf + buf->buflen, 0, delta); + buf->buflen += delta; + } + return !!new; } static void @@ -50,15 +53,16 @@ attr_to_offset(struct blob_buf *buf, struct blob_attr *attr) return (char *)attr - (char *) buf->buf + BLOB_COOKIE; } -void +bool blob_buf_grow(struct blob_buf *buf, int required) { int offset_head = attr_to_offset(buf, buf->head); if (!buf->grow || !buf->grow(buf, required)) - return; + return false; buf->head = offset_to_attr(buf, offset_head); + return true; } static struct blob_attr * @@ -69,7 +73,8 @@ blob_add(struct blob_buf *buf, struct blob_attr *pos, int id, int payload) struct blob_attr *attr; if (required > 0) { - blob_buf_grow(buf, required); + if (!blob_buf_grow(buf, required)) + return NULL; attr = offset_to_attr(buf, offset); } else { attr = pos; @@ -142,6 +147,8 @@ blob_put_raw(struct blob_buf *buf, const void *ptr, unsigned int len) return NULL; attr = blob_add(buf, blob_next(buf->head), 0, len - sizeof(struct blob_attr)); + if (!attr) + return NULL; blob_set_raw_len(buf->head, blob_pad_len(buf->head) + len); memcpy(attr, ptr, len); return attr; @@ -166,6 +173,8 @@ blob_nest_start(struct blob_buf *buf, int id) { unsigned long offset = attr_to_offset(buf, buf->head); buf->head = blob_new(buf, id, 0); + if (!buf->head) + return NULL; return (void *) offset; } |