Merge "Fix offset and ASCII type handling in exif." into gb-ub-photos-bryce (eda2f0ce) · Commits · e / os / android_packages_apps_Gallery2

gallerycommon/src/com/android/gallery3d/exif/ExifParser.java

+21 −5

Original line number	Diff line number	Diff line
		@@ -510,8 +510,10 @@ class ExifParser {
		* @see #EVENT_VALUE_OF_REGISTERED_TAG
		*/
		protected void registerForTagValue(ExifTag tag) {
		if (tag.getOffset() >= mTiffStream.getReadByteCount()) {
		mCorrespondingEvent.put(tag.getOffset(), new ExifTagEvent(tag, true));
		}
		}

		private void registerIfd(int ifdType, long offset) {
		// Cast unsigned int to int since the offset is always smaller
		@@ -563,7 +565,12 @@ class ExifParser {
		tag.setOffset((int) offset);
		}
		} else {
		boolean defCount = tag.hasDefinedCount();
		// Set defined count to 0 so we can add \0 to non-terminated strings
		tag.setHasDefinedCount(false);
		// Read value
		readFullTagValue(tag);
		tag.setHasDefinedCount(defCount);
		mTiffStream.skip(4 - dataSize);
		// Set the offset to the position of value.
		tag.setOffset(mTiffStream.getReadByteCount() - 4);
		@@ -644,13 +651,22 @@ class ExifParser {
		if (mCorrespondingEvent.size() > 0) {
		if (mCorrespondingEvent.firstEntry().getKey() < mTiffStream.getReadByteCount()
		+ size) {
		if (mCorrespondingEvent.firstEntry().getValue() instanceof ImageEvent) {
		// Invalid thumbnail offset: tag metadata overlaps with
		// strip.
		Object event = mCorrespondingEvent.firstEntry().getValue();
		if (event instanceof ImageEvent) {
		// Tag value overlaps thumbnail, ignore thumbnail.
		Log.w(TAG, "Thumbnail overlaps value for tag: \n" + tag.toString());
		Entry<Integer, Object> entry = mCorrespondingEvent.pollFirstEntry();
		// Ignore thumbnail.
		Log.w(TAG, "Invalid thumbnail offset: " + entry.getKey());
		} else {
		// Tag value overlaps another tag, shorten count
		if (event instanceof IfdEvent) {
		Log.w(TAG, "Ifd " + ((IfdEvent) event).ifd
		+ " overlaps value for tag: \n" + tag.toString());
		} else if (event instanceof ExifTagEvent) {
		Log.w(TAG, "Tag value for tag: \n"
		+ ((ExifTagEvent) event).tag.toString()
		+ " overlaps value for tag: \n" + tag.toString());
		}
		size = mCorrespondingEvent.firstEntry().getKey()
		- mTiffStream.getReadByteCount();
		Log.w(TAG, "Invalid size of tag: \n" + tag.toString()

gallerycommon/src/com/android/gallery3d/exif/ExifTag.java

+10 −1

Original line number	Diff line number	Diff line
		@@ -330,8 +330,13 @@ public class ExifTag {
		}

		byte[] buf = value.getBytes(US_ASCII);
		byte[] finalBuf = (buf[buf.length - 1] == 0 \|\| mDataType == TYPE_UNDEFINED) ? buf : Arrays
		byte[] finalBuf = buf;
		if (buf.length > 0) {
		finalBuf = (buf[buf.length - 1] == 0 \|\| mDataType == TYPE_UNDEFINED) ? buf : Arrays
		.copyOf(buf, buf.length + 1);
		} else if (mDataType == TYPE_ASCII && mComponentCountActual == 1) {
		finalBuf = new byte[] { 0 };
		}
		int count = finalBuf.length;
		if (checkBadComponentCount(count)) {
		return false;
		@@ -870,6 +875,10 @@ public class ExifTag {
		mHasDefinedDefaultComponentCount = d;
		}

		protected boolean hasDefinedCount() {
		return mHasDefinedDefaultComponentCount;
		}

		private boolean checkBadComponentCount(int count) {
		if (mHasDefinedDefaultComponentCount && (mComponentCountActual != count)) {
		return true;