diff options
| author | Earl Ou <shunhsingou@google.com> | 2012-08-08 15:19:13 +0800 |
|---|---|---|
| committer | Earl Ou <shunhsingou@google.com> | 2012-08-08 15:19:13 +0800 |
| commit | 0ee84c4254d16b584e6f3bf11d6c658631c349c0 (patch) | |
| tree | c377c40ea6abf68c7769ee55f8c39d5a6948fdae /tests/src | |
| parent | 755388cd2caf8c537fb71cb833a606596854d65a (diff) | |
| download | android_packages_apps_Gallery2-0ee84c4254d16b584e6f3bf11d6c658631c349c0.tar.gz android_packages_apps_Gallery2-0ee84c4254d16b584e6f3bf11d6c658631c349c0.tar.bz2 android_packages_apps_Gallery2-0ee84c4254d16b584e6f3bf11d6c658631c349c0.zip | |
Handle error when string length=0 in IfdParser
Change-Id: I3a51e85060f3acd5026555e5f8d21f8cb2e0641e
Diffstat (limited to 'tests/src')
| -rw-r--r-- | tests/src/com/android/gallery3d/exif/ExifParserTest.java | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/tests/src/com/android/gallery3d/exif/ExifParserTest.java b/tests/src/com/android/gallery3d/exif/ExifParserTest.java index 34bbbda5f..35f4f3f1f 100644 --- a/tests/src/com/android/gallery3d/exif/ExifParserTest.java +++ b/tests/src/com/android/gallery3d/exif/ExifParserTest.java @@ -283,12 +283,8 @@ public class ExifParserTest extends InstrumentationTestCase { } break; case ExifTag.TYPE_ASCII: - buf = new byte[tag.getComponentCount()]; - parser.read(buf); - int length = 0; - while (buf[length] != 0 && length < buf.length) length++; - // trim the string to fit the answer from xml - sbuilder.append(new String(buf, 0, length).trim()); + // trim the string for comparison between xml + sbuilder.append(parser.readString(tag.getComponentCount()).trim()); break; case ExifTag.TYPE_INT: for(int i = 0; i < tag.getComponentCount(); i++) { |