Skip to content
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.

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

[stable 12] Do not try to get the jailed path if we can't find the id #8196

Merged
merged 1 commit into from
Feb 6, 2018

Conversation

rullzer
Copy link
Member

@rullzer rullzer commented Feb 6, 2018

Backport of #8160

Fixes #8047

If we can't find the file by id there we should just return null instead
of trying to get the jailed path of null.

Signed-off-by: Roeland Jago Douma roeland@famdouma.nl

Fixes #8047

If we can't find the file by id there we should just return null instead
of trying to get the jailed path of null.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
@rullzer rullzer added bug 3. to review Waiting for reviews labels Feb 6, 2018
@rullzer rullzer added this to the Nextcloud 12.0.6 milestone Feb 6, 2018
@codecov
Copy link

codecov bot commented Feb 6, 2018

Codecov Report

Merging #8196 into stable12 will increase coverage by <.01%.
The diff coverage is 50%.

@@              Coverage Diff               @@
##             stable12    #8196      +/-   ##
==============================================
+ Coverage       53.83%   53.84%   +<.01%     
- Complexity      22761    22762       +1     
==============================================
  Files            1385     1385              
  Lines           87150    87152       +2     
  Branches         1331     1331              
==============================================
+ Hits            46920    46927       +7     
+ Misses          40230    40225       -5
Impacted Files Coverage Δ Complexity Δ
lib/private/Files/Cache/Wrapper/CacheJail.php 87.5% <50%> (-0.88%) 40 <0> (+1)
apps/files_trashbin/lib/Trashbin.php 72.53% <0%> (+0.24%) 136% <0%> (ø) ⬇️
core/js/js.js 61.83% <0%> (+0.55%) 0% <0%> (ø) ⬇️

@rullzer rullzer changed the title Do not try to get the jailed path if we can't find the id [stable 12] Do not try to get the jailed path if we can't find the id Feb 6, 2018
@MorrisJobke MorrisJobke merged commit 7e72a26 into stable12 Feb 6, 2018
@MorrisJobke MorrisJobke deleted the 8160_12 branch February 6, 2018 13:21
@MorrisJobke MorrisJobke mentioned this pull request Mar 9, 2018
2 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
3. to review Waiting for reviews bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants