diff options
| author | Jeff Brown <jeffbrown@google.com> | 2012-05-08 14:29:09 -0700 |
|---|---|---|
| committer | Jeff Brown <jeffbrown@google.com> | 2012-05-08 14:29:09 -0700 |
| commit | af67fc65bf113b028ff33e71cd6a45810018c273 (patch) | |
| tree | ce34c00243f0563bfdec0d8af1822e368068ff6f | |
| parent | c042ee2acd8529b95c5dc99240d626e61d2500cd (diff) | |
| download | frameworks_base-af67fc65bf113b028ff33e71cd6a45810018c273.zip frameworks_base-af67fc65bf113b028ff33e71cd6a45810018c273.tar.gz frameworks_base-af67fc65bf113b028ff33e71cd6a45810018c273.tar.bz2 | |
Check for null fd when constructing AssetFileDescriptor.
An AssetFileDescriptor with a null fd is pretty useless and should
never happen during normal operation. It can't even be parcelled
without hitting an NPE. To make it easier to find bugs where a null
fd might have been generated, check at construction time.
Bug: 5655036
Change-Id: I1da6dbee0cab9c11e309f3cebe698bf44dc5e27d
| -rw-r--r-- | core/java/android/content/res/AssetFileDescriptor.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/core/java/android/content/res/AssetFileDescriptor.java b/core/java/android/content/res/AssetFileDescriptor.java index 9893133..7d46710 100644 --- a/core/java/android/content/res/AssetFileDescriptor.java +++ b/core/java/android/content/res/AssetFileDescriptor.java @@ -52,6 +52,9 @@ public class AssetFileDescriptor implements Parcelable { */ public AssetFileDescriptor(ParcelFileDescriptor fd, long startOffset, long length) { + if (fd == null) { + throw new IllegalArgumentException("fd must not be null"); + } if (length < 0 && startOffset != 0) { throw new IllegalArgumentException( "startOffset must be 0 when using UNKNOWN_LENGTH"); |