diff options
| -rw-r--r-- | core/java/android/content/ContentProvider.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/core/java/android/content/ContentProvider.java b/core/java/android/content/ContentProvider.java index a64eead04c6f..a13a438cd7f7 100644 --- a/core/java/android/content/ContentProvider.java +++ b/core/java/android/content/ContentProvider.java @@ -2104,7 +2104,11 @@ public abstract class ContentProvider implements ComponentCallbacks2 { // a source of security issues. final String encodedPath = uri.getEncodedPath(); if (encodedPath != null && encodedPath.indexOf("//") != -1) { - return uri.buildUpon().encodedPath(encodedPath.replaceAll("//+", "/")).build(); + final Uri normalized = uri.buildUpon() + .encodedPath(encodedPath.replaceAll("//+", "/")).build(); + Log.w(TAG, "Normalized " + uri + " to " + normalized + + " to avoid possible security issues"); + return normalized; } else { return uri; } |