[libav-commits] alac: fix check for valid max_samples_per_frame

Justin Ruggles git at libav.org
Thu Jul 19 20:25:10 CEST 2012


Module: libav
Branch: master
Commit: 7a206eb32f624171a35235f714d44ee9dec9abcb

Author:    Justin Ruggles <justin.ruggles at gmail.com>
Committer: Justin Ruggles <justin.ruggles at gmail.com>
Date:      Mon Jul  9 13:23:22 2012 -0400

alac: fix check for valid max_samples_per_frame

---

 libavcodec/alac.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavcodec/alac.c b/libavcodec/alac.c
index db83796..1fc4dc5 100644
--- a/libavcodec/alac.c
+++ b/libavcodec/alac.c
@@ -511,9 +511,9 @@ static int alac_set_info(ALACContext *alac)
     bytestream2_skipu(&gb, 12); // size:4, alac:4, version:4
 
     alac->max_samples_per_frame = bytestream2_get_be32u(&gb);
-    if (alac->max_samples_per_frame >= UINT_MAX/4){
-        av_log(alac->avctx, AV_LOG_ERROR,
-               "max_samples_per_frame too large\n");
+    if (!alac->max_samples_per_frame || alac->max_samples_per_frame > INT_MAX) {
+        av_log(alac->avctx, AV_LOG_ERROR, "max samples per frame invalid: %u\n",
+               alac->max_samples_per_frame);
         return AVERROR_INVALIDDATA;
     }
     bytestream2_skipu(&gb, 1);  // compatible version



More information about the libav-commits mailing list