Thank you for your comments, I will modify it in the v2 version.
Best regards
Wu Guanghao
在 2021/5/24 22:40, Благодаренко Артём 写道:
> Hello Wu,
>
> Thank you for the fixes.
>
> It looks like free and return operators should be placed in {} block.
>
> {
> free(buf);
> return;
> }
>
> Now function returns any time block is read successfully.
>
> Also, this patch can not be applied cleanly to the master HEAD because of wrong offsets. Please rebase.
>
> Best regards,
> Artem Blagodarenko.
>
>> On 24 May 2021, at 14:20, Wu Guanghao <wuguanghao3@xxxxxxxxxx> wrote:
>>
>> In zap_sector(), need free buf before return,
>> otherwise it will cause memory leak.
>>
>> Signed-off-by: Wu Guanghao <wuguanghao3@xxxxxxxxxx>
>> Signed-off-by: Zhiqiang Liu <liuzhiqiang26@xxxxxxxxxx>
>> Reviewed-by: Wu Bo <wubo40@xxxxxxxxxx>
>> ---
>> misc/mke2fs.c | 1 +
>> 1 file changed, 1 insertion(+)
>>
>> diff --git a/misc/mke2fs.c b/misc/mke2fs.c
>> index afbcf486..94f81da9 100644
>> --- a/misc/mke2fs.c
>> +++ b/misc/mke2fs.c
>> @@ -586,6 +586,7 @@ static void zap_sector(ext2_filsys fs, int sect, int nsect)
>> magic = (unsigned int *) (buf + BSD_LABEL_OFFSET);
>> if ((*magic == BSD_DISKMAGIC) ||
>> (*magic == BSD_MAGICDISK))
>> + free(buf);
>> return;
>> }
>> }
>> --
>
> .
>
