Merge "Add a warning about relative paths to ZipEntry#getName."
diff --git a/luni/src/main/java/java/util/zip/ZipEntry.java b/luni/src/main/java/java/util/zip/ZipEntry.java
index d007b0f..771af83 100644
--- a/luni/src/main/java/java/util/zip/ZipEntry.java
+++ b/luni/src/main/java/java/util/zip/ZipEntry.java
@@ -147,6 +147,11 @@
/**
* Gets the name of this {@code ZipEntry}.
*
+ * <p><em>Security note:</em> Entry names can represent relative paths. {@code foo/../bar} or
+ * {@code ../bar/baz}, for example. If the entry name is being used to construct a filename
+ * or as a path component, it must be validated or sanitized to ensure that files are not
+ * written outside of the intended destination directory.
+ *
* @return the entry name.
*/
public String getName() {