From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 16 Mar 2017 20:56:42 +0000 (-0700)
Subject: Merge branch 'ax/line-log-range-merge-fix' into maint
X-Git-Tag: v2.12.1~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c5bd9e5a97ab987334b8dead3ffd353332014949;p=thirdparty%2Fgit.git

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

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
---

c5bd9e5a97ab987334b8dead3ffd353332014949