OSDN Git Service

Merge branch 'ax/line-log-range-merge-fix'
authorJunio C Hamano <gitster@pobox.com>
Mon, 13 Mar 2017 06:21:34 +0000 (23:21 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 13 Mar 2017 06:21:34 +0000 (23:21 -0700)
commit36d5286f6815542761dae92fdcdce8db1556727f
treec17757243d083a95e846e0d701fafebe57513c4a
parent271513cd549c23d109ccc048627b053bd3691a67
parentaaae0bf787f09ba102f69c3cf85d37e6554ab9fd
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
line-log.c