Re: [PATCH] apply: improve error messages when reading patch
"Phillip Wood via GitGitGadget" <gitgitgadget@gmail.com> writes:
Show 8 quoted lines
> From: Phillip Wood <phillip.wood@dunelm.org.uk>
>
> Commit f1c0e3946e (apply: reject patches larger than ~1 GiB, 2022-10-25)
> added a limit on the size of patch that apply will process to avoid
> integer overflows. The implementation re-used the existing error message
> for when we are unable to read the patch. This is unfortunate because (a) it
> does not signal to the user that the patch is being rejected because it
> is too large and (b) it uses error_errno() without setting errno.
Good description of the issue, and ...
Show 9 quoted lines
> static int read_patch_file(struct strbuf *sb, int fd)
> {
> - if (strbuf_read(sb, fd, 0) < 0 || sb->len >= MAX_APPLY_SIZE)
> - return error_errno("git apply: failed to read");
> -
> + if (strbuf_read(sb, fd, 0) < 0)
> + return error_errno(_("failed to read patch"));
> + else if (sb->len >= MAX_APPLY_SIZE)
> + return error(_("patch too large"));... quite obvious improvement. Nice.
Will queue. Thanks.