[SCM] libav/experimental: tiny_psnr: check fread() return values

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 17:10:51 UTC 2013


The following commit has been merged in the experimental branch:
commit cd3cb048d995c522cfd892d0603e1e0e96bcab6d
Author: Måns Rullgård <mans at mansr.com>
Date:   Fri Jul 9 23:26:36 2010 +0000

    tiny_psnr: check fread() return values
    
    Originally committed as revision 24148 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/tests/tiny_psnr.c b/tests/tiny_psnr.c
index 4a8ba42..0470480 100644
--- a/tests/tiny_psnr.c
+++ b/tests/tiny_psnr.c
@@ -131,14 +131,17 @@ int main(int argc,char* argv[]){
 
     for (i = 0; i < 2; i++) {
         uint8_t *p = buf[i];
-        fread(p, 1, 12, f[i]);
+        if (fread(p, 1, 12, f[i]) != 12)
+            return 1;
         if (!memcmp(p,   "RIFF", 4) &&
             !memcmp(p+8, "WAVE", 4)) {
-            fread(p, 1, 8, f[i]);
+            if (fread(p, 1, 8, f[i]) != 8)
+                return 1;
             while (memcmp(p, "data", 4)) {
                 int s = p[4] | p[5]<<8 | p[6]<<16 | p[7]<<24;
                 fseek(f[i], s, SEEK_CUR);
-                fread(p, 1, 8, f[i]);
+                if (fread(p, 1, 8, f[i]) != 8)
+                    return 1;
             }
         } else {
             fseek(f[i], -12, SEEK_CUR);

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list