Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5ba31e6e authored by Jeff Vander Stoep's avatar Jeff Vander Stoep Committed by Android Git Automerger
Browse files

am bba79795: am 25c866a8: am e2adb1ff: Merge "Sanity-check paths of files to... 

am bba79795: am 25c866a8: am e2adb1ff: Merge "Sanity-check paths of files to be restored" into jb-mr2-dev

* commit 'bba79795':
  Sanity-check paths of files to be restored
parents 1b4f1a79 bba79795

services/java/com/android/server/BackupManagerService.java

+8 −0
Original line number Diff line number Diff line
@@ -3578,6 +3578,14 @@ class BackupManagerService extends IBackupManager.Stub { 
                                break;

                        }



                        // The path needs to be canonical

                        if (info.path.contains("..") || info.path.contains("//")) {

                            if (MORE_DEBUG) {

                                Slog.w(TAG, "Dropping invalid path " + info.path);

                            }

                            okay = false;

                        }



                        // If the policy is satisfied, go ahead and set up to pipe the

                        // data to the agent.

                        if (DEBUG && okay && mAgent != null) {