48 lines
2.2 KiB
Diff
48 lines
2.2 KiB
Diff
diff --git a/libtiff/tif_dirinfo.c b/libtiff/tif_dirinfo.c
|
|
index bff7592a8fd92d24b591b6d342fa98922246db8c..2338ca21c82295ee8ab3da86035d43398fef8efc 100644
|
|
--- a/libtiff/tif_dirinfo.c
|
|
+++ b/libtiff/tif_dirinfo.c
|
|
@@ -887,7 +887,7 @@ const TIFFField *_TIFFFindOrRegisterField(TIFF *tif, uint32_t tag,
|
|
if (fld == NULL)
|
|
{
|
|
fld = _TIFFCreateAnonField(tif, tag, dt);
|
|
- if (!_TIFFMergeFields(tif, fld, 1))
|
|
+ if (fld == NULL || !_TIFFMergeFields(tif, fld, 1))
|
|
return NULL;
|
|
}
|
|
|
|
diff --git a/libtiff/tif_dirread.c b/libtiff/tif_dirread.c
|
|
index c79694145c30d70901a84bcb8932a2fcf5ad24dd..242912f3be5d15548510ce77ac791e53b112e417 100644
|
|
--- a/libtiff/tif_dirread.c
|
|
+++ b/libtiff/tif_dirread.c
|
|
@@ -4278,11 +4278,9 @@ int TIFFReadDirectory(TIFF *tif)
|
|
dp->tdir_tag, dp->tdir_tag);
|
|
/* the following knowingly leaks the
|
|
anonymous field structure */
|
|
- if (!_TIFFMergeFields(
|
|
- tif,
|
|
- _TIFFCreateAnonField(tif, dp->tdir_tag,
|
|
- (TIFFDataType)dp->tdir_type),
|
|
- 1))
|
|
+ const TIFFField *fld = _TIFFCreateAnonField(
|
|
+ tif, dp->tdir_tag, (TIFFDataType)dp->tdir_type);
|
|
+ if (fld == NULL || !_TIFFMergeFields(tif, fld, 1))
|
|
{
|
|
TIFFWarningExtR(
|
|
tif, module,
|
|
@@ -5156,11 +5154,9 @@ int TIFFReadCustomDirectory(TIFF *tif, toff_t diroff,
|
|
"Unknown field with tag %" PRIu16 " (0x%" PRIx16
|
|
") encountered",
|
|
dp->tdir_tag, dp->tdir_tag);
|
|
- if (!_TIFFMergeFields(
|
|
- tif,
|
|
- _TIFFCreateAnonField(tif, dp->tdir_tag,
|
|
- (TIFFDataType)dp->tdir_type),
|
|
- 1))
|
|
+ const TIFFField *fld = _TIFFCreateAnonField(
|
|
+ tif, dp->tdir_tag, (TIFFDataType)dp->tdir_type);
|
|
+ if (fld == NULL || !_TIFFMergeFields(tif, fld, 1))
|
|
{
|
|
TIFFWarningExtR(tif, module,
|
|
"Registering anonymous field with tag %" PRIu16
|