From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matthew Daley Subject: [PATCH 05/28] libxl: fix dispose without init of disk in cd_insert Date: Wed, 18 Sep 2013 15:37:41 +1200 Message-ID: <1379475484-25993-6-git-send-email-mattjd@gmail.com> References: <1379475484-25993-1-git-send-email-mattjd@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1379475484-25993-1-git-send-email-mattjd@gmail.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xen.org Cc: Matthew Daley , Ian Jackson , Ian Campbell , Stefano Stabellini List-Id: xen-devel@lists.xenproject.org Coverity-ID: 1056078 Signed-off-by: Matthew Daley --- tools/libxl/xl_cmdimpl.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 3d7eaad..a609b98 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -2529,18 +2529,16 @@ int main_memset(int argc, char **argv) static int cd_insert(uint32_t domid, const char *virtdev, char *phys) { - libxl_device_disk disk; /* we don't free disk's contents */ + libxl_device_disk disk; char *buf = NULL; XLU_Config *config = 0; struct stat b; int rc = 0; - if (asprintf(&buf, "vdev=%s,access=r,devtype=cdrom,target=%s", virtdev, phys ? phys : "") < 0) { fprintf(stderr, "out of memory\n"); - rc = 1; - goto out; + return 1; } parse_disk_config(&config, buf, &disk); -- 1.7.10.4