From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 13 Mar 2017 06:21:34 +0000 (-0700)
Subject: Merge branch 'ax/line-log-range-merge-fix'
X-Git-Tag: v2.13.0-rc0~128
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=36d5286f6815542761dae92fdcdce8db1556727f;p=thirdparty%2Fgit.git

Merge branch 'ax/line-log-range-merge-fix'

The code to parse "git log -L..." command line was buggy when there
are many ranges specified with -L; overrun of the allocated buffer
has been fixed.

* ax/line-log-range-merge-fix:
  line-log.c: prevent crash during union of too many ranges
---

36d5286f6815542761dae92fdcdce8db1556727f