From 33cc99f8a087d4232085234aee3f3134e15d5905 Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Sat, 30 May 2015 15:48:04 -0500 Subject: [PATCH] inode.c: do not create blob from zero-sized data buffer Moving forwards towards eliminating zero-size blobs: make inode_add_stream_with_data() and inode_replace_stream_data() use a NULL blob pointer for zero-length buffers. Currently this can happen if a Windows reparse point has no reparse data or if an empty named data stream is created in a mounted WIM image. --- src/inode.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/src/inode.c b/src/inode.c index 6277f0c4..16ae0d22 100644 --- a/src/inode.c +++ b/src/inode.c @@ -342,11 +342,13 @@ inode_replace_stream_data(struct wim_inode *inode, const void *data, size_t size, struct blob_table *blob_table) { - struct blob_descriptor *new_blob; + struct blob_descriptor *new_blob = NULL; - new_blob = new_blob_from_data_buffer(data, size, blob_table); - if (!new_blob) - return false; + if (size) { + new_blob = new_blob_from_data_buffer(data, size, blob_table); + if (!new_blob) + return false; + } inode_replace_stream_blob(inode, strm, new_blob, blob_table); return true; @@ -378,16 +380,18 @@ inode_add_stream_with_data(struct wim_inode *inode, struct blob_table *blob_table) { struct wim_inode_stream *strm; - struct blob_descriptor *blob; + struct blob_descriptor *blob = NULL; strm = inode_add_stream(inode, stream_type, stream_name, NULL); if (!strm) return false; - blob = new_blob_from_data_buffer(data, size, blob_table); - if (!blob) { - inode_remove_stream(inode, strm, blob_table); - return false; + if (size) { + blob = new_blob_from_data_buffer(data, size, blob_table); + if (unlikely(!blob)) { + inode_remove_stream(inode, strm, blob_table); + return false; + } } inode_set_stream_blob(inode, strm, blob); -- 2.43.0