Merge branch 'js/regexec-buf'
authorJunio C Hamano <gitster@pobox.com>
Fri, 24 Mar 2017 20:07:35 +0000 (13:07 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 24 Mar 2017 20:07:35 +0000 (13:07 -0700)
commit0efeb5ca12f070ca3a8cec48761af863e9a7f6fe
treefa2c09fec0d3ffadedf45fe037902028ee8905f9
parent6756b58ebc213a786adaccf3f0f07c56c8a2744a
parentf53c5de29cec68e3294a008052251631eaffcf07
Merge branch 'js/regexec-buf'

Fix for potential segv introduced in v2.11.0 and later (also
v2.10.2).

* js/regexec-buf:
  pickaxe: fix segfault with '-S<...> --pickaxe-regex'
diffcore-pickaxe.c