Skip to content

[stable22] Fix encrypted version to 0 when finding unencrypted file #28603

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PVince81 merged 2 commits into from
Aug 27, 2021
Merged

[stable22] Fix encrypted version to 0 when finding unencrypted file #28603

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e019b0d
Fix encrypted version to 0 when finding unencrypted file
PVince81 Aug 11, 2021
eada9ea
Unregister enc stream wrapper for any exception
PVince81 Aug 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Unregister enc stream wrapper for any exception 
This prevents side effects in tests by properly cleaning up
even with expected exceptions.

Signed-off-by: Vincent Petry <[email protected]>
  • Loading branch information
@PVince81
PVince81 committed Aug 26, 2021
commit eada9eaace8b7a6361aefb378df568d5326946e3
2 changes: 1 addition & 1 deletion lib/private/Files/Stream/Encryption.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ protected static function wrapSource($source, $context = [], $protocol = null, $
} else {
$wrapped = fopen($protocol . '://', $mode, false, $context);
}
} catch (\BadMethodCallException $e) {
} catch (\Exception $e) {
stream_wrapper_unregister($protocol);
throw $e;
}
Expand Down