From 8ed201229d89d2ac2e59402b2c2dd6c94829f41f Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Mon, 16 Mar 2009 15:52:24 +0000 Subject: [PATCH] Don't allocate the buffer on early error. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@29559 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../userlandfs/kernel_add_on/KernelRequestHandler.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/add-ons/kernel/file_systems/userlandfs/kernel_add_on/KernelRequestHandler.cpp b/src/add-ons/kernel/file_systems/userlandfs/kernel_add_on/KernelRequestHandler.cpp index e431d4a08d..732ed044ec 100644 --- a/src/add-ons/kernel/file_systems/userlandfs/kernel_add_on/KernelRequestHandler.cpp +++ b/src/add-ons/kernel/file_systems/userlandfs/kernel_add_on/KernelRequestHandler.cpp @@ -671,10 +671,13 @@ KernelRequestHandler::_HandleRequest(FileCacheReadRequest* request) } #else // allocate a buffer - void* buffer = malloc(size); - // TODO: Limit size! - if (buffer == NULL) - result = B_NO_MEMORY; + void* buffer = NULL; + if (result == B_OK) { + buffer = malloc(size); + // TODO: Limit size! + if (buffer == NULL) + result = B_NO_MEMORY; + } MemoryDeleter _2(buffer); // execute the request