https://bugs.freedesktop.org/show_bug.cgi?id=77065

--- Comment #15 from Patrick Ohly <[email protected]> ---
I committed the vcard merge fix into master. Getting to the bottom of the crash
on ARM still would be good.

commit 1431fd4a7be7ef6fce5743cf757362c65ece0e8d
Author: Patrick Ohly <[email protected]>
Date:   Fri Jul 11 02:35:41 2014 -0700

    datatypes: avoid PHOTO corruption during merge (FDO #77065)

    When handling an update/update conflict (both sides of the sync have an
    updated contact) and photo data was moved into a local file by EDS, the
engine
    merged the file path and the photo data together and thus corrupted the
photo.

    The engine does not know about the special role of the photo property.
    This needs to be handled by the merge script, and that script did not
    cover this particular situation. Now the loosing side is cleared,
    causing the engine to then copy the winning side over into the loosing
    one.

    Found by Renato Filho/Canonical when testing SyncEvolution for Ubuntu
14.04.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
_______________________________________________
Syncevolution-issues mailing list
[email protected]
https://lists.syncevolution.org/mailman/listinfo/syncevolution-issues

Reply via email to