exifreader 4.37.0 → 4.37.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.
- package/dist/exif-reader.js +1 -1
- package/dist/exif-reader.js.map +1 -1
- package/package.json +3 -3
- package/src/mpf-tags.js +5 -1
- package/src/tags-helpers.js +5 -5
- package/src/tags.js +5 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "exifreader",
|
|
3
|
-
"version": "4.37.
|
|
3
|
+
"version": "4.37.1",
|
|
4
4
|
"description": "Library that parses Exif metadata in images.",
|
|
5
5
|
"author": "Mattias Wallander <mattias@wallander.eu>",
|
|
6
6
|
"repository": {
|
|
@@ -44,9 +44,9 @@
|
|
|
44
44
|
"rimraf": "^5.0.5",
|
|
45
45
|
"string-replace-loader": "^3.1.0",
|
|
46
46
|
"terser-webpack-plugin": "^5.3.10",
|
|
47
|
-
"typescript": "^
|
|
47
|
+
"typescript": "^6.0.2",
|
|
48
48
|
"webpack": "5.105.4",
|
|
49
|
-
"webpack-cli": "^
|
|
49
|
+
"webpack-cli": "^7.0.0",
|
|
50
50
|
"webpack-dev-server": "^5.0.4"
|
|
51
51
|
},
|
|
52
52
|
"scripts": {
|
package/src/mpf-tags.js
CHANGED
|
@@ -22,11 +22,15 @@ function read(
|
|
|
22
22
|
tagFilter = undefined
|
|
23
23
|
) {
|
|
24
24
|
const byteOrder = ByteOrder.getByteOrder(dataView, dataOffset);
|
|
25
|
+
const ifdOffset = get0thIfdOffset(dataView, dataOffset, byteOrder);
|
|
26
|
+
if (ifdOffset === undefined) {
|
|
27
|
+
return {};
|
|
28
|
+
}
|
|
25
29
|
const tags = readIfd(
|
|
26
30
|
dataView,
|
|
27
31
|
IFD_TYPE_MPF,
|
|
28
32
|
dataOffset,
|
|
29
|
-
|
|
33
|
+
ifdOffset,
|
|
30
34
|
byteOrder,
|
|
31
35
|
includeUnknown,
|
|
32
36
|
computed,
|
package/src/tags-helpers.js
CHANGED
|
@@ -21,12 +21,12 @@ const getTagValueAt = {
|
|
|
21
21
|
};
|
|
22
22
|
|
|
23
23
|
export function get0thIfdOffset(dataView, tiffHeaderOffset, byteOrder) {
|
|
24
|
+
const offset = tiffHeaderOffset + TIFF_IFD_OFFSET_OFFSET;
|
|
25
|
+
if (offset + Types.getTypeSize('LONG') > dataView.byteLength) {
|
|
26
|
+
return undefined;
|
|
27
|
+
}
|
|
24
28
|
return tiffHeaderOffset
|
|
25
|
-
+ Types.getLongAt(
|
|
26
|
-
dataView,
|
|
27
|
-
tiffHeaderOffset + TIFF_IFD_OFFSET_OFFSET,
|
|
28
|
-
byteOrder
|
|
29
|
-
);
|
|
29
|
+
+ Types.getLongAt(dataView, offset, byteOrder);
|
|
30
30
|
}
|
|
31
31
|
|
|
32
32
|
export function readIfd(
|
package/src/tags.js
CHANGED
|
@@ -26,11 +26,15 @@ function read(dataView, tiffHeaderOffset, includeUnknown, computed = false, tagF
|
|
|
26
26
|
}
|
|
27
27
|
|
|
28
28
|
function read0thIfd(dataView, tiffHeaderOffset, byteOrder, includeUnknown, computed, tagFilter) {
|
|
29
|
+
const ifdOffset = get0thIfdOffset(dataView, tiffHeaderOffset, byteOrder);
|
|
30
|
+
if (ifdOffset === undefined) {
|
|
31
|
+
return {};
|
|
32
|
+
}
|
|
29
33
|
return readIfd(
|
|
30
34
|
dataView,
|
|
31
35
|
IFD_TYPE_0TH,
|
|
32
36
|
tiffHeaderOffset,
|
|
33
|
-
|
|
37
|
+
ifdOffset,
|
|
34
38
|
byteOrder,
|
|
35
39
|
includeUnknown,
|
|
36
40
|
computed,
|