Johannes Schindelin <Johannes.Schindelin@xxxxxx> writes:
> Hi Denton,
>
> On Wed, 4 Sep 2019, Denton Liu wrote:
>
>> After running Coccinelle on all sources inside compat/ that were created
>> by us[1], it was found that compat/mingw.c violated an array.cocci rule
>> in two places and, thus, a patch was generated. Apply this patch so that
>> all compat/ sources created by us follows all cocci rules.
>>
>> [1]: Do not run Coccinelle on files that are taken from some upstream
>> because in case we need to pull updates from them, we would like to have
>> diverged as little as possible in order to make merging updates simpler.
>>
>> The following sources were determined to have been taken from some
>> upstream:
>>
>> * compat/regex/
>> * compat/inet_ntop.c
>> * compat/inet_pton.c
>> * compat/nedmalloc/
>> * compat/obstack.{c,h}
>> * compat/poll/
>>
>> Signed-off-by: Denton Liu <liu.denton@xxxxxxxxx>
>> ---
>> compat/mingw.c | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/compat/mingw.c b/compat/mingw.c
>> index 738f0a826a..a3b1e9e3bb 100644
>> --- a/compat/mingw.c
>> +++ b/compat/mingw.c
>> @@ -1265,7 +1265,7 @@ static wchar_t *make_environment_block(char **deltaenv)
>> }
>>
>> ALLOC_ARRAY(result, size);
>> - memcpy(result, wenv, size * sizeof(*wenv));
>> + COPY_ARRAY(result, wenv, size);
>> FreeEnvironmentStringsW(wenv);
>> return result;
>> }
>> @@ -1309,7 +1309,7 @@ static wchar_t *make_environment_block(char **deltaenv)
>> continue;
>>
>> size = wcslen(array[i]) + 1;
>> - memcpy(p, array[i], size * sizeof(*p));
>> + COPY_ARRAY(p, array[i], size);
>
> ACK!
>
> Thanks,
> Dscho
Yup, looks good. Thanks both.
