@@ -814,13 +814,13 @@ static int tiff_decode_tag(TiffContext *s, AVFrame *frame)

         s->height = value;

         break;

     case TIFF_BPP:

-        s->bppcount = count;

-        if (count > 4) {

+        if (count > 4U) {

             av_log(s->avctx, AV_LOG_ERROR,

                    "This format is not supported (bpp=%d, %d components)\n",

-                   s->bpp, count);

+                   value, count);

             return AVERROR_INVALIDDATA;

         }

+        s->bppcount = count;

         if (count == 1)

             s->bpp = value;

         else {

@@ -838,6 +838,13 @@ static int tiff_decode_tag(TiffContext *s, AVFrame *frame)

                 s->bpp = -1;

             }

         }

+        if (s->bpp > 64U) {

+            av_log(s->avctx, AV_LOG_ERROR,

+                   "This format is not supported (bpp=%d, %d components)\n",

+                   s->bpp, count);

+            s->bpp = 0;

+            return AVERROR_INVALIDDATA;

+        }

         break;

     case TIFF_SAMPLES_PER_PIXEL:

         if (count != 1) {