Skip to content

Do not try to get the jailed path if we can't find the id - #8160

Merged
MorrisJobke merged 1 commit into
masterfrom
fix_8047
Feb 5, 2018
Merged

Do not try to get the jailed path if we can't find the id#8160
MorrisJobke merged 1 commit into
masterfrom
fix_8047

Conversation

@rullzer

@rullzerrullzer commented Feb 2, 2018

Copy link
Copy Markdown
Member

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

@rullzerrullzer added this to the Nextcloud 14 milestone Feb 2, 2018
@rullzerrullzer mentioned this pull request Feb 2, 2018
Closed
@rullzer
Do not try to get the jailed path if we can't find the id
53a780e
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>
@codecov

codecovBot commented Feb 3, 2018•
edited
Loading

Copy link
Copy Markdown

Codecov Report

Merging #8160 into master will decrease coverage by <.01%.
The diff coverage is 50%.

@@ Coverage Diff @@## master #8160 +/- ##
============================================
- Coverage 51.73% 51.73% -0.01% - Complexity 25357 25358 +1 
============================================
Files 1598 1598 Lines 95021 95023 +2 Branches 1376 1376 ============================================
+ Hits 49160 49161 +1 - Misses 45861 45862 +1
Impacted FilesCoverage ΔComplexity Δ
lib/private/Files/Cache/Wrapper/CacheJail.php87.5% <50%> (-0.88%)40 <0> (+1)

@MorrisJobke
MorrisJobke merged commit 30d6fd7 into masterFeb 5, 2018
@MorrisJobke
MorrisJobke deleted the fix_8047 branch February 5, 2018 10:40
@rullzerrullzer mentioned this pull request Feb 5, 2018
Merged
@MorrisJobke

MorrisJobke commented Feb 6, 2018

Copy link
Copy Markdown
Member

@rullzer Could you also backport to stable12?

@rullzer

rullzer commented Feb 6, 2018

Copy link
Copy Markdown
MemberAuthor

@MorrisJobke yes :)

@rullzerrullzer mentioned this pull request Feb 6, 2018
Merged
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@MorrisJobkeMorrisJobkeMorrisJobke approved these changes
@icewind1991icewind1991icewind1991 approved these changes

Assignees

No one assigned

Labels

3. to reviewWaiting for reviewsbugfeature: external storagefeature: sharing

Projects

None yet

Milestone

Nextcloud 14

Development

Successfully merging this pull request may close these issues.

3 participants

@rullzer@MorrisJobke@icewind1991