[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-trivial] [Qemu-devel] [PATCH] ossaudio: fix memory leak
From: |
Gonglei |
Subject: |
Re: [Qemu-trivial] [Qemu-devel] [PATCH] ossaudio: fix memory leak |
Date: |
Tue, 23 Jun 2015 16:03:41 +0800 |
User-agent: |
Mozilla/5.0 (Windows NT 6.1; rv:31.0) Gecko/20100101 Thunderbird/31.4.0 |
On 2015/6/23 15:35, Markus Armbruster wrote:
> <address@hidden> writes:
>
>> From: Gonglei <address@hidden>
>>
>> Variable "conf" going out of scope leaks the storage
>> it points to in line 856.
>>
>> Signed-off-by: Gonglei <address@hidden>
>> ---
>> 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