comparison avio.c @ 1746:2649c0a9c037 libavformat

protect the size=seek(SEEK_END,-1)+1 results with an if (.. < 0), else the return value may still end up being zero (if the seek returns -1, which is e.g. what file.c will return on error), which is a valid (but incorrect) filesize. Patch by Ronald S. Bultje % rbultje A ronald P bitfreak P net % Original thread: date: Jan 2, 2007 2:11 AM subject: [Ffmpeg-devel] Re: [PATCH] file length handling

1745:699a422bca90

    offset_t pos, size;

    size= url_seek(h, 0, AVSEEK_SIZE);
    if(size<0){
        pos = url_seek(h, 0, SEEK_CUR);
        size = url_seek(h, -1, SEEK_END)+1;
        url_seek(h, pos, SEEK_SET);
    }
    return size;
}

1746:2649c0a9c037

    offset_t pos, size;

    size= url_seek(h, 0, AVSEEK_SIZE);
    if(size<0){
        pos = url_seek(h, 0, SEEK_CUR);
        if ((size = url_seek(h, -1, SEEK_END)) < 0)
            return size;
        size++;
        url_seek(h, pos, SEEK_SET);
    }
    return size;
}