From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34924) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WJnnW-00075C-So for qemu-devel@nongnu.org; Sat, 01 Mar 2014 12:34:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WJnnO-0000gJ-Fd for qemu-devel@nongnu.org; Sat, 01 Mar 2014 12:34:02 -0500 Received: from mail-pb0-x236.google.com ([2607:f8b0:400e:c01::236]:50725) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WJnnO-0000e1-7b for qemu-devel@nongnu.org; Sat, 01 Mar 2014 12:33:54 -0500 Received: by mail-pb0-f54.google.com with SMTP id ma3so1981265pbc.27 for ; Sat, 01 Mar 2014 09:33:53 -0800 (PST) Message-ID: <53121A12.5050105@gmail.com> Date: Sun, 02 Mar 2014 01:34:10 +0800 From: Chen Gang MIME-Version: 1.0 References: <52EF68CA.9060604@gmail.com> <20140203103429.GB10408@redhat.com> <52EF71DC.3000309@gmail.com> <52F0C8BA.7020709@gmail.com> <20140204110631.GD5632@redhat.com> <52F0CD67.5070601@gmail.com> <87siry3l7t.fsf@linux.vnet.ibm.com> <52F17B5E.1050602@gmail.com> <52FF3182.9090106@gmail.com> <53097D8E.1030803@gmail.com> <87sir850ho.fsf@blackfin.pond.sub.org> <87ha7o3c5x.fsf@blackfin.pond.sub.org> <530FCBAD.10305@gmail.com> <531219CC.4050505@gmail.com> In-Reply-To: <531219CC.4050505@gmail.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH 1/3] hw/9pfs/virtio-9p-local.c: move v9fs_string_free() to below "err_out:" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Markus Armbruster , "Aneesh Kumar K.V" , aliguori@amazon.com, Eric Blake , "Daniel P. Berrange" Cc: QEMU Developers When "goto err_out", 'v9fs_string' already was allocated, so still need free 'v9fs_string' before return. Signed-off-by: Chen Gang --- hw/9pfs/virtio-9p-local.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/9pfs/virtio-9p-local.c b/hw/9pfs/virtio-9p-local.c index fc93e9e..77a04cd 100644 --- a/hw/9pfs/virtio-9p-local.c +++ b/hw/9pfs/virtio-9p-local.c @@ -1059,9 +1059,9 @@ static int local_unlinkat(FsContext *ctx, V9fsPath *dir, } /* Remove the name finally */ ret = remove(rpath(ctx, fullname.data, buffer)); - v9fs_string_free(&fullname); err_out: + v9fs_string_free(&fullname); return ret; } -- 1.7.11.7