Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(12)

Unified Diff: chrome/browser/resources/file_manager/js/exif_parser.js

Issue 9347020: Fixed EXIF parser bug. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/file_manager/js/exif_parser.js
diff --git a/chrome/browser/resources/file_manager/js/exif_parser.js b/chrome/browser/resources/file_manager/js/exif_parser.js
index 2627f65924003b948f3b1f1daea1b6d677061907..8279564ec5ae732c46300554412566e91f1b0d0c 100644
--- a/chrome/browser/resources/file_manager/js/exif_parser.js
+++ b/chrome/browser/resources/file_manager/js/exif_parser.js
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -95,10 +95,8 @@ ExifParser.prototype.parseSlice = function(
if (mark == EXIF_MARK_EXIF) {
this.parseExifSection(metadata, buf, br);
- } else if ((mark & ~0xF) == EXIF_MARK_SOF) {
+ } else if (ExifParser.isSOF_(mark)) {
// The most reliable size information is encoded in the SOF section.
- // There are 16 variants of the SOF format distinguished by the last
- // hex digit of the mark, but the part we want is always the same.
br.seek(1, ByteReader.SEEK_CUR); // Skip the precision byte.
var height = br.readScalar(2);
var width = br.readScalar(2);
@@ -114,6 +112,16 @@ ExifParser.prototype.parseSlice = function(
}
};
+ExifParser.isSOF_ = function(mark) {
+ // There are 13 variants of SOF fragment format distinguished by the last
+ // hex digit of the mark, but the part we want is always the same.
+ if ((mark & ~0xF) != EXIF_MARK_SOF) return false;
+
+ // If the last digit is 4, 8 or 12 it is not really a SOF.
+ var type = mark & 0xF;
+ return (type != 4 && type != 8 && type != 12);
+};
+
ExifParser.prototype.parseExifSection = function(metadata, buf, br) {
var magic = br.readString(6);
if (magic != 'Exif\0\0') {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698