Skip to content

GitLab

T
tangled
Commit b74305ac authored by yawano's avatar yawano Committed by Commit bot
Browse files
Options

Handle wrongly formatted EXIF string field. 

BUG=462521
TEST=out/Release/browser_tests --gtest_filter=FileManagerJsTest.ExifParser

Review URL: https://codereview.chromium.org/968793002

Cr-Commit-Position: refs/heads/master@{#318654}
parent 3cb91369
Hide whitespace changes
Inline Side-by-side
Showing with 110 additions and 0 deletions
chrome/browser/chromeos/file_manager/file_manager_jstest.cc
View file @ b74305ac
...@@ -158,3 +158,8 @@ IN_PROC_BROWSER_TEST_F(FileManagerJsTest, ThumbnailModel) { ...@@ -158,3 +158,8 @@ IN_PROC_BROWSER_TEST_F(FileManagerJsTest, ThumbnailModel) {
RunTest(base::FilePath(FILE_PATH_LITERAL( RunTest(base::FilePath(FILE_PATH_LITERAL(
"foreground/js/metadata/thumbnail_model_unittest.html"))); "foreground/js/metadata/thumbnail_model_unittest.html")));
} }
IN_PROC_BROWSER_TEST_F(FileManagerJsTest, ExifParser) {
RunTest(base::FilePath(FILE_PATH_LITERAL(
"foreground/js/metadata/exif_parser_unittest.html")));
}
ui/file_manager/file_manager/foreground/js/metadata/exif_parser.js
View file @ b74305ac
...@@ -362,6 +362,7 @@ ExifParser.prototype.readTagValue = function(br, tag) { ...@@ -362,6 +362,7 @@ ExifParser.prototype.readTagValue = function(br, tag) {
} else { } else {
tag.value = String.fromCharCode.apply(null, tag.value); tag.value = String.fromCharCode.apply(null, tag.value);
} }
this.validateAndFixStringTag_(tag);
break; break;
case 3: // Short case 3: // Short
...@@ -399,6 +400,23 @@ ExifParser.prototype.readTagValue = function(br, tag) { ...@@ -399,6 +400,23 @@ ExifParser.prototype.readTagValue = function(br, tag) {
tag.value); tag.value);
}; };
/**
* Validates string tag value, and fix it if necessary.
* @param {!ExifEntry} tag A tag to be validated and fixed.
* @private
*/
ExifParser.prototype.validateAndFixStringTag_ = function(tag) {
if (tag.format === 2) { // string
// String should end with null character.
if (tag.value.charAt(tag.value.length - 1) !== '\0') {
tag.value += '\0';
tag.componentCount = tag.value.length;
this.vlog('Invalid format: 0x' + tag.id.toString(16) + '/' + tag.format +
': Did not end with null character. Null character is appended.');
}
}
};
/** /**
* Map from the exif orientation value to the horizontal scale value. * Map from the exif orientation value to the horizontal scale value.
* @const * @const
......
ui/file_manager/file_manager/foreground/js/metadata/exif_parser_unittest.html 0 → 100644
View file @ b74305ac
<!DOCTYPE html>
<!-- Copyright 2015 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.
-->
<script type="text/javascript">
function importScripts(script) {}
</script>
<script src="../../../../gallery/js/image_editor/image_encoder.js"></script>
<script src="../../../../gallery/js/image_editor/exif_encoder.js"></script>
<script src="metadata_dispatcher.js"></script>
<script src="metadata_parser.js"></script>
<script src="byte_reader.js"></script>
<script src="exif_constants.js"></script>
<script src="exif_parser.js"></script>
<script src="exif_parser_unittest.js"></script>
ui/file_manager/file_manager/foreground/js/metadata/exif_parser_unittest.js 0 → 100644
View file @ b74305ac
// Copyright 2015 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.
/**
* Creates a directory with specified tag. This method only supports string
* format tag which is longer than 4 characters.
* @param {!TypedArray} bytes Bytes to be written.
* @param {!ExifEntry} tag An exif entry which will be written.
*/
function writeDirectory_(bytes, tag) {
assertEquals(2, tag.format);
assertTrue(tag.componentCount > 4);
var byteWriter = new ByteWriter(bytes.buffer, 0);
byteWriter.writeScalar(1, 2); // Number of fields.
byteWriter.writeScalar(tag.id, 2);
byteWriter.writeScalar(tag.format, 2);
byteWriter.writeScalar(tag.componentCount, 4);
byteWriter.forward(tag.id, 4);
byteWriter.writeScalar(0, 4); // Offset to next IFD.
byteWriter.resolveOffset(tag.id);
byteWriter.writeString(tag.value);
byteWriter.checkResolved();
}
/**
* Parses exif data and return parsed tags.
* @param {!TypedArray} bytes Bytes to be read.
* @return {!Object<!Exif.Tag, !ExifEntry>} Tags.
*/
function parseExifData_(bytes) {
var exifParser = new ExifParser(this);
exifParser.log = function(arg) { console.log(arg); };
exifParser.vlog = function(arg) { console.log(arg); };
var tags = {};
var byteReader = new ByteReader(bytes.buffer);
assertEquals(0, exifParser.readDirectory(byteReader, tags));
return tags;
}
/**
* Test case a string doest not end with null character termination.
*/
function testWithoutNullCharacterTermination() {
// Create a data which doesn't end with null character.
var bytes = new Uint8Array(0x10000);
writeDirectory_(bytes, {
id: 0x10f, // Manufacture.
format: 2, // String.
componentCount: 11,
value: 'Manufacture'
});
// Parse the data.
var tags = parseExifData_(bytes);
// Null character should be added at the end of value.
var manufactureTag = tags[0x10f];
assertEquals(12, manufactureTag.componentCount);
assertEquals('Manufacture\0', manufactureTag.value);
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment