On Wed, Nov 27, 2013 at 06:02:05PM +0100, Vittorio Giovara wrote:
> From: Michael Niedermayer <[email protected]>
>
> Fixes out of array accesses and integer overflows.
> ---
> Squashed, as requested by Kostya.
> Vittorio
>
> libavcodec/dsputil.c | 4 ++--
> libavcodec/pngdsp.c | 2 +-
> 2 files changed, 3 insertions(+), 3 deletions(-)
dsputil/pngdsp:
> --- a/libavcodec/dsputil.c
> +++ b/libavcodec/dsputil.c
> @@ -1742,7 +1742,7 @@ void ff_set_cmp(DSPContext* c, me_cmp_func *cmp, int
> type){
> static void add_bytes_c(uint8_t *dst, uint8_t *src, int w){
> long i;
> - for(i=0; i<=w-sizeof(long); i+=sizeof(long)){
> + for(i=0; i<=w-(int)sizeof(long); i+=sizeof(long)){
> long a = *(long*)(src+i);
> @@ -1767,7 +1767,7 @@ static void diff_bytes_c(uint8_t *dst, uint8_t *src1,
> uint8_t *src2, int w){
> #endif
> - for(i=0; i<=w-sizeof(long); i+=sizeof(long)){
> + for(i=0; i<=w-(int)sizeof(long); i+=sizeof(long)){
> long a = *(long*)(src1+i);
extra good karma for fixing spacing on the lines you change
Diego
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
