From ddc2a758e6a5f4b5e15990153dbe8e663732e797 Mon Sep 17 00:00:00 2001 From: Murai Takashi Date: Sun, 14 Jul 2013 17:34:46 +0900 Subject: [PATCH] Chunk::Chunk(), Fix Null pointer argument in call to memory copy function MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérôme Duval --- src/add-ons/kernel/file_systems/btrfs/Chunk.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/add-ons/kernel/file_systems/btrfs/Chunk.cpp b/src/add-ons/kernel/file_systems/btrfs/Chunk.cpp index 95d82a4b5b..ee08cbdc08 100644 --- a/src/add-ons/kernel/file_systems/btrfs/Chunk.cpp +++ b/src/add-ons/kernel/file_systems/btrfs/Chunk.cpp @@ -30,8 +30,11 @@ Chunk::Chunk(struct btrfs_chunk* chunk, fsblock_t offset) fChunkOffset = offset; fChunk = (struct btrfs_chunk*)malloc(sizeof(struct btrfs_chunk) + chunk->StripeCount() * sizeof(struct btrfs_stripe)); - if (fChunk == NULL) + if (fChunk == NULL) { fInitStatus = B_NO_MEMORY; + return; + } + memcpy(fChunk, chunk, sizeof(struct btrfs_chunk) + chunk->StripeCount() * sizeof(struct btrfs_stripe));