From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 24732 invoked by alias); 28 Jan 2015 11:37:46 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 24152 invoked by uid 89); 28 Jan 2015 11:37:45 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-0.5 required=5.0 tests=AWL,SPF_PASS,UNPARSEABLE_RELAY autolearn=ham version=3.3.2 X-Spam-User: qpsmtpd, 2 recipients X-HELO: out2130-229.mail.aliyun.com Received: from out2130-229.mail.aliyun.com (HELO out2130-229.mail.aliyun.com) (42.156.130.229) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 28 Jan 2015 11:37:43 +0000 X-Alimail-AntiSpam:AC=AD;BC=0.9148045|0.09908034;BR=01201311R141b1;FP=0|0|0|0|0|-1|-1|-1;HT=r41g03005;MF=gang.chen@sunrus.com.cn;PH=DS;RN=2;RT=2;SR=0; Received: from ShengShiZhuChengdeMacBook-Pro.local(mailfrom:gang.chen@sunrus.com.cn ip:124.127.118.42) by smtp.aliyun-inc.com(10.147.38.22); Wed, 28 Jan 2015 19:37:32 +0800 Message-ID: <54C8CBC8.90102@sunrus.com.cn> Date: Wed, 28 Jan 2015 15:53:00 -0000 From: Chen Gang S User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.10; rv:31.0) Gecko/20100101 Thunderbird/31.4.0 MIME-Version: 1.0 To: gdb-patches@sourceware.org CC: binutils@sourceware.org Subject: [PATCH] sim: Be sure of calling freeargv() after successfully call buildargv(). Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-SW-Source: 2015-01/txt/msg00732.txt.bz2 buildargv() and freeargv() are pairs, so need be sure of them always paired to avoid memory leak. 2015-01-28 Chen Gang * common/sim-options.c (sim_args_command): Call freeargv() when failure occurs. * mcore/interp.c (sim_do_command): Call freeargv() before return. * microblaze/interp.c (sim_do_command): Call freeargv() before return. --- sim/ChangeLog | 8 ++++++++ sim/common/sim-options.c | 5 ++++- sim/mcore/interp.c | 3 +++ sim/microblaze/interp.c | 3 +++ 4 files changed, 18 insertions(+), 1 deletion(-) diff --git a/sim/ChangeLog b/sim/ChangeLog index 03c244b..a5c3f5d 100644 --- a/sim/ChangeLog +++ b/sim/ChangeLog @@ -1,3 +1,11 @@ +2015-01-28 Chen Gang + + * common/sim-options.c (sim_args_command): Call freeargv() when + failure occurs. + * mcore/interp.c (sim_do_command): Call freeargv() before return. + * microblaze/interp.c (sim_do_command): Call freeargv() before + return. + 2014-07-01 Chen Gang * sim/microblaze/interp.c: Use long int format instead of int diff --git a/sim/common/sim-options.c b/sim/common/sim-options.c index c49220e..814edcf 100644 --- a/sim/common/sim-options.c +++ b/sim/common/sim-options.c @@ -993,7 +993,10 @@ sim_args_command (SIM_DESC sd, const char *cmd) sim_cpu *cpu; if (argv [0] == NULL) - return SIM_RC_OK; /* FIXME - perhaps help would be better */ + { + freeargv (argv); + return SIM_RC_OK; /* FIXME - perhaps help would be better */ + } /* First check for a cpu selector. */ { diff --git a/sim/mcore/interp.c b/sim/mcore/interp.c index d2edd12..dfaa6aa 100644 --- a/sim/mcore/interp.c +++ b/sim/mcore/interp.c @@ -2143,6 +2143,7 @@ sim_do_command (sd, cmd) if ((simargv[1] == NULL) || (simargv[2] == NULL)) { fprintf (stderr, "Error: missing argument to watch cmd.\n"); + freeargv (simargv); return; } @@ -2187,6 +2188,8 @@ sim_do_command (sd, cmd) fprintf (stderr,"Error: \"%s\" is not a valid M.CORE simulator command.\n", cmd); } + + freeargv (simargv); } else { diff --git a/sim/microblaze/interp.c b/sim/microblaze/interp.c index 1c8a22d..4fc4595 100644 --- a/sim/microblaze/interp.c +++ b/sim/microblaze/interp.c @@ -1019,6 +1019,7 @@ sim_do_command (SIM_DESC sd, const char *cmd) if ((simargv[1] == NULL) || (simargv[2] == NULL)) { fprintf (stderr, "Error: missing argument to watch cmd.\n"); + freeargv (simargv); return; } @@ -1062,6 +1063,8 @@ sim_do_command (SIM_DESC sd, const char *cmd) fprintf (stderr,"Error: \"%s\" is not a valid M.CORE simulator command.\n", cmd); } + + freeargv (simargv); } else { -- 1.9.3 (Apple Git-50)