haiwen/seafile — pull request #513 by mlq (2014-01-16 13:37:10+00:00)
Title: Resolve possible error with uninitialized variable in merge-recursive.c

This patch resolves a possible NULL pointer dereference in
merge-recursive/get_unmerged that can occur if either the ce_in_unmerged_list
condition or the memory allocation of calloc fails. By initializing e with NULL
and additional checks this possible error can be avoided.