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
https://phabricator.kde.org/D10543?vs=276
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
sandsmark updated this revision to Diff 27668.
CHANGES SINCE LAST UPDATE
https://phabricator.kde.org/D10543?vs=27664&id=27668
REVISION DETAIL
https://phabricator.kde.org/D10543
AFFECTED FILES
src/karchive.cpp
src/kzip.cpp
To: sandsmark, dfaure, #frameworks
Cc: apol, michaelh
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&id=27664
REVISION DETAIL
https://phabricator.kde.o
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";
> +
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&id=27286
REVISION DETAIL
https://phabricator.kde.org/D10543
AFFECTED FIL
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
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&id=27281
REVISION DETAIL
https://phabricator.kde.org/D10543
AFFECTED FILES
src/karchive.cpp
To: sandsmar
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 (d->entries.val
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
https://ph
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&id=27275
REVISION DETAIL
https://phabricator.kde.org/D10543
AFFECTED FILES
src/karch
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 alrea
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 PLAN
13 matches
Mail list logo
