exifreader 4.39.1 → 4.40.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -10,6 +10,7 @@ export function buildTagsFromMergeSteps({
10
10
  tagFilter,
11
11
  dataView,
12
12
  tiffHeaderOffset,
13
+ exifDataView,
13
14
  fileType,
14
15
  pngTextChunks,
15
16
  pngTextIsAsync,
@@ -27,6 +28,7 @@ export function buildTagsFromMergeSteps({
27
28
  tagFilter,
28
29
  dataView,
29
30
  tiffHeaderOffset,
31
+ exifDataView,
30
32
  fileType,
31
33
  thumbnailIfdTags,
32
34
  tags,
@@ -64,6 +66,7 @@ export function applyMergeStep({
64
66
  tagFilter,
65
67
  dataView,
66
68
  tiffHeaderOffset,
69
+ exifDataView,
67
70
  fileType,
68
71
  thumbnailIfdTags,
69
72
  tags,
@@ -304,7 +307,7 @@ export function applyMergeStep({
304
307
  const thumbnail = (deps.Constants.USE_JPEG || deps.Constants.USE_WEBP)
305
308
  && deps.Constants.USE_EXIF
306
309
  && deps.Constants.USE_THUMBNAIL
307
- && deps.Thumbnail.get(dataView, parsedThumbnailIfdTags, tiffHeaderOffset);
310
+ && deps.Thumbnail.get(exifDataView || dataView, parsedThumbnailIfdTags, tiffHeaderOffset);
308
311
  if (thumbnail) {
309
312
  tags.Thumbnail = thumbnail;
310
313
  } else {
@@ -314,6 +317,22 @@ export function applyMergeStep({
314
317
  return tags;
315
318
  }
316
319
 
320
+ if (step.type === 'metadataRange') {
321
+ if (!expanded) {
322
+ return tags;
323
+ }
324
+ const metadataRange = buildMetadataRange(
325
+ step.metadataBlocks,
326
+ step.metadataTruncated,
327
+ dataView,
328
+ parsedGroups
329
+ );
330
+ if (metadataRange) {
331
+ tags.metadataRange = metadataRange;
332
+ }
333
+ return tags;
334
+ }
335
+
317
336
  if (step.type === 'fileType') {
318
337
  if (
319
338
  fileType
@@ -461,3 +480,49 @@ export function addPngTextReadTagsToTagsAndGroups({
461
480
  export function isThenable(value) {
462
481
  return !!value && typeof value.then === 'function';
463
482
  }
483
+
484
+ function buildMetadataRange(metadataBlocks, metadataTruncated, dataView, parsedGroups) {
485
+ const blocks = (metadataBlocks || []).slice();
486
+ const finderTruncated = !!metadataTruncated;
487
+
488
+ if (parsedGroups && parsedGroups.mpf && Array.isArray(parsedGroups.mpf.Images)) {
489
+ for (let i = 0; i < parsedGroups.mpf.Images.length; i++) {
490
+ const image = parsedGroups.mpf.Images[i];
491
+ if (!image || !image.ImageOffset || !image.ImageSize) {
492
+ continue;
493
+ }
494
+ const offset = image.ImageOffset.value;
495
+ const size = image.ImageSize.value;
496
+ // Skip the primary self-reference (offset 0), malformed entries,
497
+ // and zero-length entries.
498
+ if (typeof offset !== 'number' || offset <= 0
499
+ || typeof size !== 'number' || size <= 0) {
500
+ continue;
501
+ }
502
+ blocks.push({
503
+ type: 'mpfImage',
504
+ start: offset,
505
+ end: offset + size,
506
+ });
507
+ }
508
+ }
509
+
510
+ if (blocks.length === 0) {
511
+ return undefined;
512
+ }
513
+
514
+ blocks.sort((a, b) => a.start - b.start);
515
+
516
+ const start = blocks[0].start;
517
+ let end = blocks[0].end;
518
+ for (let i = 1; i < blocks.length; i++) {
519
+ if (blocks[i].end > end) {
520
+ end = blocks[i].end;
521
+ }
522
+ }
523
+
524
+ const byteLength = dataView && typeof dataView.byteLength === 'number' ? dataView.byteLength : 0;
525
+ const complete = !finderTruncated && end <= byteLength;
526
+
527
+ return {start, end, complete, blocks};
528
+ }
package/src/mpf-tags.js CHANGED
@@ -21,23 +21,27 @@ function read(
21
21
  computed = false,
22
22
  tagFilter = undefined
23
23
  ) {
24
- const byteOrder = ByteOrder.getByteOrder(dataView, dataOffset);
25
- const ifdOffset = get0thIfdOffset(dataView, dataOffset, byteOrder);
26
- if (ifdOffset === undefined) {
24
+ try {
25
+ const byteOrder = ByteOrder.getByteOrder(dataView, dataOffset);
26
+ const ifdOffset = get0thIfdOffset(dataView, dataOffset, byteOrder);
27
+ if (ifdOffset === undefined) {
28
+ return {};
29
+ }
30
+ const tags = readIfd(
31
+ dataView,
32
+ IFD_TYPE_MPF,
33
+ dataOffset,
34
+ ifdOffset,
35
+ byteOrder,
36
+ includeUnknown,
37
+ computed,
38
+ tagFilter,
39
+ 'mpf'
40
+ );
41
+ return addMpfImages(dataView, dataOffset, tags, byteOrder);
42
+ } catch (error) {
27
43
  return {};
28
44
  }
29
- const tags = readIfd(
30
- dataView,
31
- IFD_TYPE_MPF,
32
- dataOffset,
33
- ifdOffset,
34
- byteOrder,
35
- includeUnknown,
36
- computed,
37
- tagFilter,
38
- 'mpf'
39
- );
40
- return addMpfImages(dataView, dataOffset, tags, byteOrder);
41
45
  }
42
46
 
43
47
  function addMpfImages(dataView, dataOffset, tags, byteOrder) {
@@ -39,29 +39,33 @@ function read(
39
39
  computed = false,
40
40
  tagFilter = undefined
41
41
  ) {
42
- // Pentax does not use the standard TIFF header offset as base for tag
43
- // offsets but instead uses the start of the IFD, i.e. directly after the
44
- // two byte order bytes. originOffset below is this offset.
45
- const byteOrder = ByteOrder.getByteOrder(dataView, tiffHeaderOffset + offset + BYTE_ORDER_OFFSET);
46
- const originOffset = tiffHeaderOffset + offset;
47
- let tags = readIfd(
48
- dataView,
49
- IFD_TYPE_PENTAX,
50
- originOffset,
51
- originOffset + PENTAX_IFD_OFFSET,
52
- byteOrder,
53
- includeUnknown,
54
- computed,
55
- tagFilter,
56
- 'makerNotes'
57
- );
58
-
59
- if (hasLevelInfoK3III(tags)) {
60
- tags = objectAssign({}, tags, parseLevelInfoK3III(dataView, originOffset + tags['LevelInfo'].__offset, byteOrder));
61
- delete tags['LevelInfo'];
62
- }
42
+ try {
43
+ // Pentax does not use the standard TIFF header offset as base for tag
44
+ // offsets but instead uses the start of the IFD, i.e. directly after the
45
+ // two byte order bytes. originOffset below is this offset.
46
+ const byteOrder = ByteOrder.getByteOrder(dataView, tiffHeaderOffset + offset + BYTE_ORDER_OFFSET);
47
+ const originOffset = tiffHeaderOffset + offset;
48
+ let tags = readIfd(
49
+ dataView,
50
+ IFD_TYPE_PENTAX,
51
+ originOffset,
52
+ originOffset + PENTAX_IFD_OFFSET,
53
+ byteOrder,
54
+ includeUnknown,
55
+ computed,
56
+ tagFilter,
57
+ 'makerNotes'
58
+ );
59
+
60
+ if (hasLevelInfoK3III(tags)) {
61
+ tags = objectAssign({}, tags, parseLevelInfoK3III(dataView, originOffset + tags['LevelInfo'].__offset, byteOrder));
62
+ delete tags['LevelInfo'];
63
+ }
63
64
 
64
- return tags;
65
+ return tags;
66
+ } catch (error) {
67
+ return {};
68
+ }
65
69
  }
66
70
 
67
71
  function hasLevelInfoK3III(tags) {
package/src/utils.js CHANGED
@@ -36,7 +36,9 @@ export function getNullTerminatedStringFromDataView(dataView, offset) {
36
36
 
37
37
  export function getUnicodeStringFromDataView(dataView, offset, length) {
38
38
  const chars = [];
39
- for (let i = 0; i < length && offset + i < dataView.byteLength; i += 2) {
39
+ // Each iteration reads a 2-byte code unit, so both bytes must fit within
40
+ // the requested length and the buffer.
41
+ for (let i = 0; i + 2 <= length && offset + i + 2 <= dataView.byteLength; i += 2) {
40
42
  chars.push(dataView.getUint16(offset + i));
41
43
  }
42
44
  if (chars[chars.length - 1] === 0) {
package/src/vp8x-tags.js CHANGED
@@ -10,11 +10,16 @@ export default {
10
10
 
11
11
  const IMAGE_WIDTH_OFFSET = 4;
12
12
  const IMAGE_HEIGHT_OFFSET = 7;
13
+ const VP8X_DATA_SIZE = 10;
13
14
 
14
15
  // https://developers.google.com/speed/webp/docs/riff_container#extended_file_format
15
16
  function read(dataView, chunkOffset) {
16
17
  const tags = {};
17
18
 
19
+ if (chunkOffset + VP8X_DATA_SIZE > dataView.byteLength) {
20
+ return tags;
21
+ }
22
+
18
23
  const flags = Types.getByteAt(dataView, chunkOffset);
19
24
 
20
25
  tags['Alpha'] = getAlpha(flags);
package/src/xml.js CHANGED
@@ -12,14 +12,52 @@ export default {
12
12
  const XML_MARKER_OFFSET = 0;
13
13
  const XML_MARKER = '<?xpacket begin';
14
14
 
15
+ // Closing markers for an XMP packet. `</x:xmpmeta>` covers XMP without an
16
+ // xpacket wrapper.
17
+ const XMP_END_PATTERNS = [
18
+ '<?xpacket end=',
19
+ '</x:xmpmeta>',
20
+ ];
21
+
22
+ /**
23
+ * Checks if the provided data view represents a standalone XMP file.
24
+ *
25
+ * @param {DataView} dataView The data view to check.
26
+ * @returns {boolean} True if the data view starts with the XMP packet marker.
27
+ */
15
28
  function isXMLFile(dataView) {
16
29
  return !!dataView && getStringFromDataView(dataView, XML_MARKER_OFFSET, XML_MARKER.length) === XML_MARKER;
17
30
  }
18
31
 
19
- function findOffsets(dataView) {
32
+ /**
33
+ * Finds the XMP chunk offset for a standalone XMP file.
34
+ *
35
+ * @param {DataView} dataView The data view to find offsets in.
36
+ * @param {Array<Object>=} metadataBlocks Optional out-array. When provided,
37
+ * receives one `xmp` block covering the whole buffer and gets a
38
+ * `truncated` property set to true if no XMP closing marker is found.
39
+ * @returns {{xmpChunks: Array<{dataOffset: number, length: number}>}}
40
+ */
41
+ function findOffsets(dataView, metadataBlocks) {
20
42
  const xmpChunks = [];
21
43
  xmpChunks.push({dataOffset: XML_MARKER_OFFSET, length: dataView.byteLength});
44
+ if (metadataBlocks) {
45
+ metadataBlocks.push({type: 'xmp', start: 0, end: dataView.byteLength});
46
+ metadataBlocks.truncated = !hasXmpClosingMarker(dataView);
47
+ }
22
48
  return {
23
49
  xmpChunks,
24
50
  };
25
51
  }
52
+
53
+ function hasXmpClosingMarker(dataView) {
54
+ // XMP packets can have arbitrary trailing whitespace padding, so scan
55
+ // the entire buffer rather than a fixed tail window.
56
+ const text = getStringFromDataView(dataView, 0, dataView.byteLength);
57
+ for (let i = 0; i < XMP_END_PATTERNS.length; i++) {
58
+ if (text.indexOf(XMP_END_PATTERNS[i]) !== -1) {
59
+ return true;
60
+ }
61
+ }
62
+ return false;
63
+ }