• Show log

    Commit

  • Hash : 4dc87e72
    Author : Patrick Steinhardt
    Date : 2017-06-21T13:35:46

    merge: fix potential free of uninitialized memory
    
    The function `merge_diff_mark_similarity_exact` may error our early and,
    when it does so, free the `ours_deletes_by_oid` and
    `theirs_deletes_by_oid` variables. While the first one can never be
    uninitialized due to the first call actually assigning to it, the second
    variable can be freed without being initialized.
    
    Fix the issue by initializing both variables to `NULL`.