| Message ID | 20221123071710.28506-4-masahisa.kojima@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | miscellaneous fixes of eficonfig | expand |
On 11/23/22 08:17, Masahisa Kojima wrote: > Use u16_strsize() to simplify the u16 string buffer > size calculation. > > Signed-off-by: Masahisa Kojima <masahisa.kojima@linaro.org> Reviewed-by: Heinrich Schuchardt <xypron.glpk@gmx.de> > --- > cmd/eficonfig.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/cmd/eficonfig.c b/cmd/eficonfig.c > index 20b9a29d3a..282b5d2cf2 100644 > --- a/cmd/eficonfig.c > +++ b/cmd/eficonfig.c > @@ -452,8 +452,7 @@ struct efi_device_path *eficonfig_create_device_path(struct efi_device_path *dp_ > struct efi_device_path *dp; > struct efi_device_path_file_path *fp; > > - fp_size = sizeof(struct efi_device_path) + > - ((u16_strlen(current_path) + 1) * sizeof(u16)); > + fp_size = sizeof(struct efi_device_path) + u16_strsize(current_path); > buf = calloc(1, fp_size + sizeof(END)); > if (!buf) > return NULL;
diff --git a/cmd/eficonfig.c b/cmd/eficonfig.c index 20b9a29d3a..282b5d2cf2 100644 --- a/cmd/eficonfig.c +++ b/cmd/eficonfig.c @@ -452,8 +452,7 @@ struct efi_device_path *eficonfig_create_device_path(struct efi_device_path *dp_ struct efi_device_path *dp; struct efi_device_path_file_path *fp; - fp_size = sizeof(struct efi_device_path) + - ((u16_strlen(current_path) + 1) * sizeof(u16)); + fp_size = sizeof(struct efi_device_path) + u16_strsize(current_path); buf = calloc(1, fp_size + sizeof(END)); if (!buf) return NULL;
Use u16_strsize() to simplify the u16 string buffer size calculation. Signed-off-by: Masahisa Kojima <masahisa.kojima@linaro.org> --- cmd/eficonfig.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)