Merge pull request #2895 from ethomson/alloc_overflow

author Carlos Martín Nieto <cmn@dwim.me>

Sun, 15 Feb 2015 04:13:50 +0000 (05:13 +0100)

committer Carlos Martín Nieto <cmn@dwim.me>

Sun, 15 Feb 2015 04:13:50 +0000 (05:13 +0100)
author Carlos Martín Nieto <cmn@dwim.me>
Sun, 15 Feb 2015 04:13:50 +0000 (05:13 +0100)
committer Carlos Martín Nieto <cmn@dwim.me>
Sun, 15 Feb 2015 04:13:50 +0000 (05:13 +0100)
diff --cc src/config_file.c
Simple merge
diff --cc src/fileops.c
Simple merge
author	Carlos Martín Nieto <cmn@dwim.me>
	Sun, 15 Feb 2015 04:13:50 +0000 (05:13 +0100)
committer	Carlos Martín Nieto <cmn@dwim.me>
	Sun, 15 Feb 2015 04:13:50 +0000 (05:13 +0100)
		1	2
src/config_file.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/fileops.c	patch \|	diff1 \|	diff2 \|	blob \| history