From 2561d5808a330240a28841e8b3ce706a65ed31c9 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Sat, 21 Nov 2015 23:10:04 -0800
Subject: sim: sim_do_commandf: fix call to va_end [PR sim/19273]

Make sure we call va_end even in the error case.
---
 sim/common/sim-utils.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'sim/common/sim-utils.c')

diff --git a/sim/common/sim-utils.c b/sim/common/sim-utils.c
index 63d532d..c6f96a8 100644
--- a/sim/common/sim-utils.c
+++ b/sim/common/sim-utils.c
@@ -328,15 +328,20 @@ sim_do_commandf (SIM_DESC sd,
 {
   va_list ap;
   char *buf;
+  int ret;
+
   va_start (ap, fmt);
-  if (vasprintf (&buf, fmt, ap) < 0)
+  ret = vasprintf (&buf, fmt, ap);
+  va_end (ap);
+
+  if (ret < 0)
     {
       sim_io_eprintf (sd, "%s: asprintf failed for `%s'\n",
 		      STATE_MY_NAME (sd), fmt);
       return;
     }
+
   sim_do_command (sd, buf);
-  va_end (ap);
   free (buf);
 }
 
-- 
cgit v1.1