[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH] progress: Check for NULL filename
|
From: |
Andrei Borzenkov |
|
Subject: |
Re: [PATCH] progress: Check for NULL filename |
|
Date: |
Thu, 13 Aug 2015 10:52:19 +0300 |
On Wed, Aug 12, 2015 at 6:53 PM, dann frazier
<address@hidden> wrote:
> Avoid a NULL pointer dereference if the upper fs layer hasn't set the
> file->name field. Files opened through the grub_net_fs interface currently do
> not have this field set (though perhaps they should?).
>
file->name is set in grub_file_open independently of any filesystem
used. How comes it becomes empty? Do you see it in current GIT master?
> Signed-off-by: dann frazier <address@hidden>
> ---
> grub-core/lib/progress.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/grub-core/lib/progress.c b/grub-core/lib/progress.c
> index 63a0767..2775554 100644
> --- a/grub-core/lib/progress.c
> +++ b/grub-core/lib/progress.c
> @@ -70,8 +70,7 @@ grub_file_progress_hook_real (grub_disk_addr_t sector
> __attribute__ ((unused)),
> percent = grub_divmod64 (100 * file->progress_offset,
> file->size, 0);
>
> - partial_file_name = grub_strrchr (file->name, '/');
> - if (partial_file_name)
> + if (file->name && (partial_file_name = grub_strrchr (file->name, '/')))
> partial_file_name++;
> else
> partial_file_name = "";
> --
> 2.5.0
>
>
> _______________________________________________
> Grub-devel mailing list
> address@hidden
> https://lists.gnu.org/mailman/listinfo/grub-devel