Skip to content

Fix part file partial cache logic in encryption code#22220

Merged
DeepDiver1975 merged 1 commit intomasterfrom
enc-fixfilesizelogicwithpartfile
Feb 9, 2016
Merged

Fix part file partial cache logic in encryption code#22220
DeepDiver1975 merged 1 commit intomasterfrom
enc-fixfilesizelogicwithpartfile

Conversation

@PVince81
Copy link
Copy Markdown
Contributor

@PVince81 PVince81 commented Feb 8, 2016

The encryption code uses partial cache entries for the part file (which
are not stored in the database) but are useful for other parts of the
code to retrieve the file size again.

This means that in the fixed code $info was empty, so getData() could
not be called.

The fix makes sure to support both cases when the cache entry exists and
doesn't.

Fixes #22125

Please review @LukasReschke @schiesbn @icewind1991 @nickvergessen

The encryption code uses partial cache entries for the part file (which
are not stored in the database) but are useful for other parts of the
code to retrieve the file size again.

This means that in the fixed code $info was empty, so getData() could
not be called.

The fix makes sure to support both cases when the cache entry exists and
doesn't.
@LukasReschke LukasReschke force-pushed the enc-fixfilesizelogicwithpartfile branch from fc1b809 to 19980be Compare February 9, 2016 08:47
@LukasReschke
Copy link
Copy Markdown
Member

Works here. Awesome, thanks a lot for taking care of this 🚀 👯 👍

@schiessle
Copy link
Copy Markdown
Contributor

looks good 👍

@nickvergessen
Copy link
Copy Markdown
Contributor

Running the most crucial smashbox atm just to be sure

@nickvergessen
Copy link
Copy Markdown
Contributor

shareFile passes again ✅
👍

DeepDiver1975 added a commit that referenced this pull request Feb 9, 2016
Fix part file partial cache logic in encryption code
@DeepDiver1975 DeepDiver1975 merged commit 254e0fa into master Feb 9, 2016
@DeepDiver1975 DeepDiver1975 deleted the enc-fixfilesizelogicwithpartfile branch February 9, 2016 10:06
@schiessle
Copy link
Copy Markdown
Contributor

Wonder why this happened only now. Don't remember that we changed anything here since 8.2.... Is this something we should consider backporting? @PVince81 @LukasReschke ?

@PVince81
Copy link
Copy Markdown
Contributor Author

PVince81 commented Feb 9, 2016

@schiesbn no, this was mistakenly changed by @icewind1991 in 9.0 as part of introducing ICacheEntry.

@lock lock Bot locked as resolved and limited conversation to collaborators Aug 7, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Failing smashbox test on master with encryption + sharing

5 participants