From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:60998)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <arei.gonglei@huawei.com>) id 1Z7JBo-00043f-SF
	for qemu-devel@nongnu.org; Tue, 23 Jun 2015 04:04:20 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <arei.gonglei@huawei.com>) id 1Z7JBn-0006kx-Vp
	for qemu-devel@nongnu.org; Tue, 23 Jun 2015 04:04:16 -0400
Message-ID: <558912DD.3060509@huawei.com>
Date: Tue, 23 Jun 2015 16:03:41 +0800
From: Gonglei <arei.gonglei@huawei.com>
MIME-Version: 1.0
References: <1435021270-7768-1-git-send-email-arei.gonglei@huawei.com>
	<87si9izxkq.fsf@blackfin.pond.sub.org>
In-Reply-To: <87si9izxkq.fsf@blackfin.pond.sub.org>
Content-Type: text/plain; charset="windows-1252"
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH] ossaudio: fix memory leak
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Markus Armbruster <armbru@redhat.com>
Cc: qemu-trivial@nongnu.org, qemu-devel@nongnu.org, kraxel@redhat.com

On 2015/6/23 15:35, Markus Armbruster wrote:
> <arei.gonglei@huawei.com> writes:
> 
>> From: Gonglei <arei.gonglei@huawei.com>
>>
>> Variable "conf" going out of scope leaks the storage
>> it points to in line 856.
>>
>> Signed-off-by: Gonglei <arei.gonglei@huawei.com>
>> ---
>>  audio/ossaudio.c | 1 +
>>  1 file changed, 1 insertion(+)
>>
>> diff --git a/audio/ossaudio.c b/audio/ossaudio.c
>> index 11e76a1..7dbe333 100644
>> --- a/audio/ossaudio.c
>> +++ b/audio/ossaudio.c
>> @@ -853,6 +853,7 @@ static void *oss_audio_init (void)
>    static void *oss_audio_init (void)
>    {
>        OSSConf *conf = g_malloc(sizeof(OSSConf));
>        *conf = glob_conf;
>>  
>>      if (access(conf->devpath_in, R_OK | W_OK) < 0 ||
>>          access(conf->devpath_out, R_OK | W_OK) < 0) {
>> +        g_free(conf);
>>          return NULL;
>>      }
>>      return conf;
>    }
> 
> Simpler (untested):
> 
>    static void *oss_audio_init (void)
>    {
>        if (access(globconf.devpath_in, R_OK | W_OK) < 0 ||
>            access(globconf.devpath_out, R_OK | W_OK) < 0) {
>            return NULL;
>        }
>        return g_memdup(&glob_conf, sizeof(glob_conf));
>    }
> 
I think your approach is better :)
Do you want to submit a patch? Or let me post v2 for this?

Regards,
-Gonglei