diff options
| author | Owen Lin <owenlin@android.com> | 2012-08-10 01:17:00 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-08-10 01:17:01 -0700 |
| commit | 13722d8f4dc6d0b0f868f73885f5f1c1298590cc (patch) | |
| tree | 916f51ef6397ddb0799dbba8c719577ad44028c4 /src | |
| parent | 95591d2a17036cbc610a9ab586d5e66b8036edd0 (diff) | |
| parent | 0ee84c4254d16b584e6f3bf11d6c658631c349c0 (diff) | |
| download | android_packages_apps_Gallery2-13722d8f4dc6d0b0f868f73885f5f1c1298590cc.tar.gz android_packages_apps_Gallery2-13722d8f4dc6d0b0f868f73885f5f1c1298590cc.tar.bz2 android_packages_apps_Gallery2-13722d8f4dc6d0b0f868f73885f5f1c1298590cc.zip | |
Merge "Handle error when string length=0 in IfdParser" into gb-ub-photos-arches
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/gallery3d/exif/IfdParser.java | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/com/android/gallery3d/exif/IfdParser.java b/src/com/android/gallery3d/exif/IfdParser.java index b0b0bce10..0d1059cb0 100644 --- a/src/com/android/gallery3d/exif/IfdParser.java +++ b/src/com/android/gallery3d/exif/IfdParser.java @@ -125,9 +125,13 @@ public class IfdParser { } public String readString(int n) throws IOException { - byte[] buf = new byte[n]; - mTiffStream.readOrThrow(buf); - return new String(buf, 0, n - 1, "UTF8"); + if (n > 0) { + byte[] buf = new byte[n]; + mTiffStream.readOrThrow(buf); + return new String(buf, 0, n - 1, "UTF8"); + } else { + return ""; + } } public String readString(int n, Charset charset) throws IOException { |