git/builtin
Johannes Schindelin 882add136f difftool: fix use-after-free
The left and right base directories were pointed to the buf field of
two strbufs, which were subject to change.

A contrived test case shows the problem where a file with a long enough
name to force the strbuf to grow is up-to-date (hence the code path is
used where the work tree's version of the file is reused), and then a
file that is not up-to-date needs to be written (hence the code path is
used where checkout_entry() uses the previously recorded base_dir that
is invalid by now).

Let's just copy the base_dir strings for use with checkout_entry(),
never touch them until the end, and release them then. This is an easily
verifiable fix (as opposed to the next-obvious alternative: to re-set
base_dir after every loop iteration).

This fixes https://github.com/git-for-windows/git/issues/1124

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-04-13 17:53:08 -07:00
..
2016-09-19 13:47:19 -07:00
2016-11-22 13:55:20 -08:00
2016-10-10 14:03:51 -07:00
2016-09-22 13:42:18 -07:00
2016-02-26 13:37:16 -08:00
2016-09-29 15:42:18 -07:00
2016-09-21 15:15:24 -07:00
2017-04-13 17:53:08 -07:00
2016-09-29 15:42:18 -07:00
2016-10-10 14:03:50 -07:00
2016-10-27 14:58:48 -07:00
2016-09-29 20:40:23 -07:00
2016-09-26 16:09:17 -07:00
2016-11-22 13:13:16 -08:00
2016-10-26 13:30:51 -07:00
2016-09-29 15:42:18 -07:00
2016-10-03 13:30:33 -07:00
2016-09-29 15:42:18 -07:00
2016-07-14 15:50:41 -07:00
2016-09-29 15:42:18 -07:00
2016-07-13 11:24:10 -07:00
2015-10-05 13:20:08 -07:00
2016-10-17 13:25:22 -07:00
2016-10-27 14:58:47 -07:00
2016-09-29 20:40:23 -07:00
2016-10-03 12:46:47 -07:00
2016-04-29 12:59:09 -07:00