Merge lp:~mterry/snappy/allow-more-dots-15.04 into lp:~snappy-dev/snappy/15.04-deprecated
Proposed by
Michael Terry
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | John Lenton | ||||
Approved revision: | 447 | ||||
Merged at revision: | 449 | ||||
Proposed branch: | lp:~mterry/snappy/allow-more-dots-15.04 | ||||
Merge into: | lp:~snappy-dev/snappy/15.04-deprecated | ||||
Diff against target: |
41 lines (+14/-1) 2 files modified
clickdeb/deb.go (+3/-1) clickdeb/deb_test.go (+11/-0) |
||||
To merge this branch: | bzr merge lp:~mterry/snappy/allow-more-dots-15.04 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
John Lenton (community) | Approve | ||
Review via email: mp+260996@code.launchpad.net |
Commit message
Allow ".." in file paths as long as it isn't an entire element. (i.e. allow "hello..you" or "...")
We call filepath.Clean right before our ".." check. So the only instances of ".." will be in the first element. That lets us simplify the check a lot.
This is a backport of r457 from trunk.
Description of the change
Allow ".." in file paths as long as it isn't an entire element. (i.e. allow "hello..you" or "...")
We call filepath.Clean right before our ".." check. So the only instances of ".." will be in the first element. That lets us simplify the check a lot.
This is a backport of r457 from trunk.
To post a comment you must log in.
Do you mind adding a backport comment to the commit message for traceability since it seems to be lost with bzr.
Something like
bzr merge -c 457 lp:snappy or "changes from lp:~mterry/snappy/allow-more-dots"
Looks good