Re: [PATCH v2 2/3] textconv: support for blame
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:48:58
Possibly related (same subject, not in this thread)
- 2016-06-15 · Re: [PATCH v2 2/3] textconv: support for blame · Matthieu Moy <hidden>
- 2016-06-15 · Re: [PATCH v2 2/3] textconv: support for blame · Jeff King <hidden>
- 2016-06-15 · Re: [PATCH v2 2/3] textconv: support for blame · bonneta <hidden>
- 2016-06-15 · Re: [PATCH v2 2/3] textconv: support for blame · Junio C Hamano <hidden>
- 2016-06-15 · Re: [PATCH v2 2/3] textconv: support for blame · Junio C Hamano <hidden>
Axel Bonnet [off-list ref] writes:
quoted hunk
@@ -86,16 +87,49 @@ struct origin {... +static void fill_origin_blob(struct diff_options *opt, + struct origin *o, mmfile_t *file) { if (!o->file.ptr) { enum object_type type; num_read_blob++; - file->ptr = read_sha1_file(o->blob_sha1, &type, - (unsigned long *)(&(file->size))); + + if (DIFF_OPT_TST(opt, ALLOW_TEXTCONV) && + textconv_object(o->path, o->blob_sha1, &file->ptr, + (size_t *) &file->size))
This cast is not correct, as there is no guarantee that your size_t and typeof(mmfile_t.size) are compatible. Depending on the gcc version, you would get "dereferencing type-punned pointer will break strict-aliasing rules" error. The same issue exists in Clément's patch to builtin/cat-file.c.