D10543: fix crashing with duplicate entries

This revision was automatically updated to reflect the committed changes. Closed by commit R243:6736aca49c2d: karchive, kzip: try to handle duplicate files in a bit nicer way (authored by sandsmark). REPOSITORY R243 KArchive CHANGES SINCE LAST UPDATE

D10543: fix crashing with duplicate entries

dfaure accepted this revision. This revision is now accepted and ready to land. REVISION DETAIL https://phabricator.kde.org/D10543 To: sandsmark, dfaure, #frameworks Cc: apol, michaelh

D10543: fix crashing with duplicate entries

sandsmark updated this revision to Diff 27668. CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D10543?vs=27664=27668 REVISION DETAIL https://phabricator.kde.org/D10543 AFFECTED FILES src/karchive.cpp src/kzip.cpp To: sandsmark, dfaure, #frameworks Cc: apol, michaelh

D10543: fix crashing with duplicate entries

sandsmark updated this revision to Diff 27664. sandsmark marked 7 inline comments as done. sandsmark added a comment. fixes to issues raised REPOSITORY R243 KArchive CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D10543?vs=27286=27664 REVISION DETAIL

D10543: fix crashing with duplicate entries

dfaure requested changes to this revision. dfaure added a comment. This revision now requires changes to proceed. Thanks for the fix! INLINE COMMENTS > karchive.cpp:471 > } else { > -//qCWarning(KArchiveLog) << "Found" << path << "but it's not a > directory"; > +

D10543: fix crashing with duplicate entries

sandsmark updated this revision to Diff 27286. sandsmark added a comment. an actual fix, which passes all unit tests. REPOSITORY R243 KArchive CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D10543?vs=27281=27286 REVISION DETAIL https://phabricator.kde.org/D10543 AFFECTED FILES

D10543: fix crashing with duplicate entries

sandsmark added a dependency: D10551: autotest for crashing in KArchiveDirectory::addEntry. REPOSITORY R243 KArchive REVISION DETAIL https://phabricator.kde.org/D10543 To: sandsmark, dfaure, #frameworks Cc: apol, michaelh

D10543: fix crashing with duplicate entries

sandsmark updated this revision to Diff 27281. sandsmark added a comment. prettify REPOSITORY R243 KArchive CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D10543?vs=27276=27281 REVISION DETAIL https://phabricator.kde.org/D10543 AFFECTED FILES src/karchive.cpp To: sandsmark,

D10543: fix crashing with duplicate entries

apol added inline comments. INLINE COMMENTS > karchive.cpp:829 > { > -if (d->entries.value(entry->name())) { > -/*qCWarning(KArchiveLog) << "directory " << name() > -<< "has entry" << entry->name() << "already";*/ > -delete entry; > +if

D10543: fix crashing with duplicate entries

sandsmark updated this revision to Diff 27276. sandsmark added a comment. handle stuff a bit prettier. I don't think there's a "right" way to handle this, so parsing is a bit best-effort, but at least it doesn't crash anymore. REPOSITORY R243 KArchive CHANGES SINCE LAST UPDATE

D10543: fix crashing with duplicate entries

sandsmark updated this revision to Diff 27275. sandsmark added a comment. actually do the correct thing REPOSITORY R243 KArchive CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D10543?vs=27254=27275 REVISION DETAIL https://phabricator.kde.org/D10543 AFFECTED FILES

D10543: fix crashing with duplicate entries

apol added inline comments. INLINE COMMENTS > karchive.cpp:832-833 > +<< "has entry" << entry->name() << "already"; > +delete d->entries.take(entry->name()); > return; > } Haven't looked at the code yet, but this doesn't make much sense. Since it's

D10543: fix crashing with duplicate entries

sandsmark created this revision. sandsmark added reviewers: dfaure, Frameworks. Restricted Application added a project: Frameworks. sandsmark requested review of this revision. REVISION SUMMARY some zip files apparently can have duplicate entry names, which weren't handled correctly. TEST