[FFmpeg-cvslog] tools/qt-faststart: Fix unintended sign extension of atom_size

Michael Niedermayer git at videolan.org
Sun Jun 2 23:19:02 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jun  2 23:07:06 2013 +0200| [69ce34c796dd2d595f3312848cf6d0c87506e0d0] | committer: Michael Niedermayer

tools/qt-faststart: Fix unintended sign extension of atom_size

Fixes CID733810

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=69ce34c796dd2d595f3312848cf6d0c87506e0d0
---

 tools/qt-faststart.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/qt-faststart.c b/tools/qt-faststart.c
index c9aa6e8..489c1ab 100644
--- a/tools/qt-faststart.c
+++ b/tools/qt-faststart.c
@@ -229,7 +229,7 @@ int main(int argc, char *argv[])
         atom_type = BE_32(&moov_atom[i]);
         if (atom_type == STCO_ATOM) {
             printf(" patching stco atom...\n");
-            atom_size = BE_32(&moov_atom[i - 4]);
+            atom_size = (uint32_t)BE_32(&moov_atom[i - 4]);
             if (i + atom_size - 4 > moov_atom_size) {
                 printf(" bad atom size\n");
                 goto error_out;
@@ -250,7 +250,7 @@ int main(int argc, char *argv[])
             i += atom_size - 4;
         } else if (atom_type == CO64_ATOM) {
             printf(" patching co64 atom...\n");
-            atom_size = BE_32(&moov_atom[i - 4]);
+            atom_size = (uint32_t)BE_32(&moov_atom[i - 4]);
             if (i + atom_size - 4 > moov_atom_size) {
                 printf(" bad atom size\n");
                 goto error_out;



More information about the ffmpeg-cvslog mailing list